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

diff --cc drivers/net/bnx2.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/pcmcia/smc91c92_cs.c
Simple merge

diff --cc drivers/net/sb1250-mac.c
Simple merge

diff --cc drivers/net/sfc/efx.c
Simple merge

diff --cc drivers/net/sfc/falcon.c
Simple merge

diff --cc drivers/net/sfc/nic.h
Simple merge

diff --cc drivers/net/sfc/siena.c
Simple merge

diff --cc drivers/net/usb/cdc_ether.c
Simple merge

diff --cc drivers/net/wireless/p54/p54pci.c
Simple merge

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/bluetooth/l2cap.c
Simple merge

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

diff --cc net/ipv6/inet6_connection_sock.c
Simple merge

diff --cc net/sctp/socket.c
index d54700af927ade324abba113d107857e70229de9,44a1ab03a3f0124ac33c63aa62f54b5663b52914..bae764005d2df19bf2d483edde15ec56eb4d0a68
--- 1/net/sctp/socket.c
--- 2/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@@ -3719,9 -3719,12 +3719,9 @@@ SCTP_STATIC int sctp_init_sock(struct s
        sp->hmac = NULL;
  
        SCTP_DBG_OBJCNT_INC(sock);
-       percpu_counter_inc(&sctp_sockets_allocated);
  
 -      /* Set socket backlog limit. */
 -      sk->sk_backlog.limit = sysctl_sctp_rmem[1];
 -
        local_bh_disable();
+       percpu_counter_inc(&sctp_sockets_allocated);
        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
        local_bh_enable();
  
@@@ -6185,6 -6189,16 +6185,19 @@@ do_nonblock
        goto out;
  }
  
 -      read_lock_bh(&sk->sk_callback_lock);
 -      if (sk_has_sleeper(sk))
 -              wake_up_interruptible_sync_poll(sk->sk_sleep, POLLIN |
+ void sctp_data_ready(struct sock *sk, int len)
+ {
 -      read_unlock_bh(&sk->sk_callback_lock);
++      struct socket_wq *wq;
++
++      rcu_read_lock();
++      wq = rcu_dereference(sk->sk_wq);
++      if (wq_has_sleeper(wq))
++              wake_up_interruptible_sync_poll(&wq->wait, POLLIN |
+                                               POLLRDNORM | POLLRDBAND);
+       sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
++      rcu_read_unlock();
+ }
+ 
  /* If socket sndbuf has changed, wake up all per association waiters.  */
  void sctp_write_space(struct sock *sk)
  {