From: David S. Miller <davem@davemloft.net>
Date: Fri, 8 May 2009 09:48:30 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~18292^2~526
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22f6dacdfcfdc792d068e9c41234808860498d04;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	include/net/tcp.h
---

22f6dacdfcfdc792d068e9c41234808860498d04
diff --cc drivers/net/wireless/iwlwifi/iwl-sta.c
index 17a4dd2,44ab03a..0072ea2
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@@ -754,11 -765,9 +765,9 @@@ void iwl_update_tkip_key(struct iwl_pri
  {
  	u8 sta_id = IWL_INVALID_STATION;
  	unsigned long flags;
- 	__le16 key_flags = 0;
  	int i;
- 	DECLARE_MAC_BUF(mac);
  
 -	sta_id = iwl_find_station(priv, addr);
 +	sta_id = priv->cfg->ops->smgmt->find_station(priv, addr);
  	if (sta_id == IWL_INVALID_STATION) {
  		IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n",
  				   addr);
diff --cc include/net/tcp.h
index 87d210b,646dbe3..19f4150
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@@ -890,32 -889,30 +902,32 @@@ static inline int tcp_prequeue(struct s
  {
  	struct tcp_sock *tp = tcp_sk(sk);
  
 -	if (!sysctl_tcp_low_latency && tp->ucopy.task) {
 -		__skb_queue_tail(&tp->ucopy.prequeue, skb);
 -		tp->ucopy.memory += skb->truesize;
 -		if (tp->ucopy.memory > sk->sk_rcvbuf) {
 -			struct sk_buff *skb1;
 -
 -			BUG_ON(sock_owned_by_user(sk));
 -
 -			while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
 -				sk_backlog_rcv(sk, skb1);
 -				NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPPREQUEUEDROPPED);
 -			}
 -
 -			tp->ucopy.memory = 0;
 -		} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
 -			wake_up_interruptible(sk->sk_sleep);
 -			if (!inet_csk_ack_scheduled(sk))
 -				inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
 -						          (3 * tcp_rto_min(sk)) / 4,
 -							  TCP_RTO_MAX);
 +	if (sysctl_tcp_low_latency || !tp->ucopy.task)
 +		return 0;
 +
 +	__skb_queue_tail(&tp->ucopy.prequeue, skb);
 +	tp->ucopy.memory += skb->truesize;
 +	if (tp->ucopy.memory > sk->sk_rcvbuf) {
 +		struct sk_buff *skb1;
 +
 +		BUG_ON(sock_owned_by_user(sk));
 +
 +		while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
 +			sk_backlog_rcv(sk, skb1);
 +			NET_INC_STATS_BH(sock_net(sk),
 +					 LINUX_MIB_TCPPREQUEUEDROPPED);
  		}
 -		return 1;
 +
 +		tp->ucopy.memory = 0;
 +	} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
 +		wake_up_interruptible_poll(sk->sk_sleep,
 +					   POLLIN | POLLRDNORM | POLLRDBAND);
 +		if (!inet_csk_ack_scheduled(sk))
 +			inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
- 						  (3 * TCP_RTO_MIN) / 4,
++						  (3 * tcp_rto_min(sk)) / 4,
 +						  TCP_RTO_MAX);
  	}
 -	return 0;
 +	return 1;
  }