Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	include/net/tcp.h

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/usb/Kconfig
Simple merge

diff --cc drivers/net/usb/Makefile
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-sta.c
index 17a4dd2be1f217e1dcffa5a88bc85b98c70c39ac,44ab03a12e40e353014fe56e67e0fd18f815585d..0072ea2c536113c3258371cba6bc2211b23fb93d
--- 1/drivers/net/wireless/iwlwifi/iwl-sta.c
--- 2/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 drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc include/net/tcp.h
index 87d210bb12a4762a31e714f48d958a29b0b3cd09,646dbe3962eab7ae3832c9e8641549ef9e9d95f9..19f4150f4d4d166380f95079c1877af28e6d62a5
--- 1/include/net/tcp.h
--- 2/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;
  }
  
  

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge