Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c

1 files changed, 91 insertions, 43 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index b1a4290996b5..9fc4da56fb1d 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -56,6 +56,7 @@
 #include <linux/if_arp.h>
 #include <linux/smp_lock.h>
 #include <linux/termios.h>      /* For TIOCOUTQ/INQ */
+#include <linux/compat.h>
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <net/sock.h>
@@ -922,13 +923,8 @@ static unsigned long atalk_sum_partial(const unsigned char *data,
 {
         /* This ought to be unwrapped neatly. I'll trust gcc for now */
         while (len--) {
-                sum += *data;
-                sum <<= 1;
-                if (sum & 0x10000) {
-                        sum++;
-                        sum &= 0xffff;
-                }
-                data++;
+                sum += *data++;
+                sum = rol16(sum, 1);
         }
         return sum;
 }
@@ -1021,12 +1017,13 @@ static struct proto ddp_proto = {
  * Create a socket. Initialise the socket, blank the addresses
  * set the state.
  */
-static int atalk_create(struct net *net, struct socket *sock, int protocol)
+static int atalk_create(struct net *net, struct socket *sock, int protocol,
+                        int kern)
 {
         struct sock *sk;
         int rc = -ESOCKTNOSUPPORT;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         /*
@@ -1054,11 +1051,13 @@ static int atalk_release(struct socket *sock)
 {
         struct sock *sk = sock->sk;
 
+        lock_kernel();
         if (sk) {
                 sock_orphan(sk);
                 sock->sk = NULL;
                 atalk_destroy_socket(sk);
         }
+        unlock_kernel();
         return 0;
 }
 
@@ -1134,6 +1133,7 @@ static int atalk_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         struct sockaddr_at *addr = (struct sockaddr_at *)uaddr;
         struct sock *sk = sock->sk;
         struct atalk_sock *at = at_sk(sk);
+        int err;
 
         if (!sock_flag(sk, SOCK_ZAPPED) ||
             addr_len != sizeof(struct sockaddr_at))
@@ -1142,37 +1142,44 @@ static int atalk_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         if (addr->sat_family != AF_APPLETALK)
                 return -EAFNOSUPPORT;
 
+        lock_kernel();
         if (addr->sat_addr.s_net == htons(ATADDR_ANYNET)) {
                 struct atalk_addr *ap = atalk_find_primary();
 
+                err = -EADDRNOTAVAIL;
                 if (!ap)
-                        return -EADDRNOTAVAIL;
+                        goto out;
 
                 at->src_net  = addr->sat_addr.s_net = ap->s_net;
                 at->src_node = addr->sat_addr.s_node= ap->s_node;
         } else {
+                err = -EADDRNOTAVAIL;
                 if (!atalk_find_interface(addr->sat_addr.s_net,
                                           addr->sat_addr.s_node))
-                        return -EADDRNOTAVAIL;
+                        goto out;
 
                 at->src_net  = addr->sat_addr.s_net;
                 at->src_node = addr->sat_addr.s_node;
         }
 
         if (addr->sat_port == ATADDR_ANYPORT) {
-                int n = atalk_pick_and_bind_port(sk, addr);
+                err = atalk_pick_and_bind_port(sk, addr);
 
-                if (n < 0)
-                        return n;
+                if (err < 0)
+                        goto out;
         } else {
                 at->src_port = addr->sat_port;
 
+                err = -EADDRINUSE;
                 if (atalk_find_or_insert_socket(sk, addr))
-                        return -EADDRINUSE;
+                        goto out;
         }
 
         sock_reset_flag(sk, SOCK_ZAPPED);
-        return 0;
+        err = 0;
+out:
+        unlock_kernel();
+        return err;
 }
 
 /* Set the address we talk to */
@@ -1182,6 +1189,7 @@ static int atalk_connect(struct socket *sock, struct sockaddr *uaddr,
         struct sock *sk = sock->sk;
         struct atalk_sock *at = at_sk(sk);
         struct sockaddr_at *addr;
+        int err;
 
         sk->sk_state   = TCP_CLOSE;
         sock->state = SS_UNCONNECTED;
@@ -1206,12 +1214,15 @@ static int atalk_connect(struct socket *sock, struct sockaddr *uaddr,
 #endif
         }
 
+        lock_kernel();
+        err = -EBUSY;
         if (sock_flag(sk, SOCK_ZAPPED))
                 if (atalk_autobind(sk) < 0)
-                        return -EBUSY;
+                        goto out;
 
+        err = -ENETUNREACH;
         if (!atrtr_get_dev(&addr->sat_addr))
-                return -ENETUNREACH;
+                goto out;
 
         at->dest_port = addr->sat_port;
         at->dest_net  = addr->sat_addr.s_net;
@@ -1219,7 +1230,10 @@ static int atalk_connect(struct socket *sock, struct sockaddr *uaddr,
 
         sock->state  = SS_CONNECTED;
         sk->sk_state = TCP_ESTABLISHED;
-        return 0;
+        err = 0;
+out:
+        unlock_kernel();
+        return err;
 }
 
 /*
@@ -1232,17 +1246,21 @@ static int atalk_getname(struct socket *sock, struct sockaddr *uaddr,
         struct sockaddr_at sat;
         struct sock *sk = sock->sk;
         struct atalk_sock *at = at_sk(sk);
+        int err;
 
+        lock_kernel();
+        err = -ENOBUFS;
         if (sock_flag(sk, SOCK_ZAPPED))
                 if (atalk_autobind(sk) < 0)
-                        return -ENOBUFS;
+                        goto out;
 
         *uaddr_len = sizeof(struct sockaddr_at);
         memset(&sat.sat_zero, 0, sizeof(sat.sat_zero));
 
         if (peer) {
+                err = -ENOTCONN;
                 if (sk->sk_state != TCP_ESTABLISHED)
-                        return -ENOTCONN;
+                        goto out;
 
                 sat.sat_addr.s_net  = at->dest_net;
                 sat.sat_addr.s_node = at->dest_node;
@@ -1253,9 +1271,23 @@ static int atalk_getname(struct socket *sock, struct sockaddr *uaddr,
                 sat.sat_port        = at->src_port;
         }
 
+        err = 0;
         sat.sat_family = AF_APPLETALK;
         memcpy(uaddr, &sat, sizeof(sat));
-        return 0;
+
+out:
+        unlock_kernel();
+        return err;
+}
+
+static unsigned int atalk_poll(struct file *file, struct socket *sock,
+                           poll_table *wait)
+{
+        int err;
+        lock_kernel();
+        err = datagram_poll(file, sock, wait);
+        unlock_kernel();
+        return err;
 }
 
 #if defined(CONFIG_IPDDP) || defined(CONFIG_IPDDP_MODULE)
@@ -1563,23 +1595,28 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
         if (len > DDP_MAXSZ)
                 return -EMSGSIZE;
 
+        lock_kernel();
         if (usat) {
+                err = -EBUSY;
                 if (sock_flag(sk, SOCK_ZAPPED))
                         if (atalk_autobind(sk) < 0)
-                                return -EBUSY;
+                                goto out;
 
+                err = -EINVAL;
                 if (msg->msg_namelen < sizeof(*usat) ||
                     usat->sat_family != AF_APPLETALK)
-                        return -EINVAL;
+                        goto out;
 
+                err = -EPERM;
                 /* netatalk didn't implement this check */
                 if (usat->sat_addr.s_node == ATADDR_BCAST &&
                     !sock_flag(sk, SOCK_BROADCAST)) {
-                        return -EPERM;
+                        goto out;
                 }
         } else {
+                err = -ENOTCONN;
                 if (sk->sk_state != TCP_ESTABLISHED)
-                        return -ENOTCONN;
+                        goto out;
                 usat = &local_satalk;
                 usat->sat_family      = AF_APPLETALK;
                 usat->sat_port        = at->dest_port;
@@ -1603,8 +1640,9 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 
                 rt = atrtr_find(&at_hint);
         }
+        err = ENETUNREACH;
         if (!rt)
-                return -ENETUNREACH;
+                goto out;
 
         dev = rt->dev;
 
@@ -1614,7 +1652,7 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
         size += dev->hard_header_len;
         skb = sock_alloc_send_skb(sk, size, (flags & MSG_DONTWAIT), &err);
         if (!skb)
-                return err;
+                goto out;
 
         skb->sk = sk;
         skb_reserve(skb, ddp_dl->header_length);
@@ -1637,7 +1675,8 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
         err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
         if (err) {
                 kfree_skb(skb);
-                return -EFAULT;
+                err = -EFAULT;
+                goto out;
         }
 
         if (sk->sk_no_check == 1)
@@ -1676,7 +1715,8 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
                         rt = atrtr_find(&at_lo);
                         if (!rt) {
                                 kfree_skb(skb);
-                                return -ENETUNREACH;
+                                err = -ENETUNREACH;
+                                goto out;
                         }
                         dev = rt->dev;
                         skb->dev = dev;
@@ -1696,7 +1736,9 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
         }
         SOCK_DEBUG(sk, "SK %p: Done write (%Zd).\n", sk, len);
 
-        return len;
+out:
+        unlock_kernel();
+        return err ? : len;
 }
 
 static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
@@ -1708,10 +1750,13 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
         int copied = 0;
         int offset = 0;
         int err = 0;
-        struct sk_buff *skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,
+        struct sk_buff *skb;
+
+        lock_kernel();
+        skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,
                                                 flags & MSG_DONTWAIT, &err);
         if (!skb)
-                return err;
+                goto out;
 
         /* FIXME: use skb->cb to be able to use shared skbs */
         ddp = ddp_hdr(skb);
@@ -1739,6 +1784,9 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
         }
 
         skb_free_datagram(sk, skb);     /* Free the datagram. */
+
+out:
+        unlock_kernel();
         return err ? : copied;
 }
 
@@ -1810,24 +1858,26 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 static int atalk_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
         /*
-         * All Appletalk ioctls except SIOCATALKDIFADDR are standard.  And
-         * SIOCATALKDIFADDR is handled by upper layer as well, so there is
-         * nothing to do.  Eventually SIOCATALKDIFADDR should be moved
-         * here so there is no generic SIOCPROTOPRIVATE translation in the
-         * system.
+         * SIOCATALKDIFADDR is a SIOCPROTOPRIVATE ioctl number, so we
+         * cannot handle it in common code. The data we access if ifreq
+         * here is compatible, so we can simply call the native
+         * handler.
          */
+        if (cmd == SIOCATALKDIFADDR)
+                return atalk_ioctl(sock, cmd, (unsigned long)compat_ptr(arg));
+
         return -ENOIOCTLCMD;
 }
 #endif
 
 
-static struct net_proto_family atalk_family_ops = {
+static const struct net_proto_family atalk_family_ops = {
         .family         = PF_APPLETALK,
         .create         = atalk_create,
         .owner          = THIS_MODULE,
 };
 
-static const struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops) = {
+static const struct proto_ops atalk_dgram_ops = {
         .family         = PF_APPLETALK,
         .owner          = THIS_MODULE,
         .release        = atalk_release,
@@ -1836,7 +1886,7 @@ static const struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops) = {
         .socketpair     = sock_no_socketpair,
         .accept         = sock_no_accept,
         .getname        = atalk_getname,
-        .poll           = datagram_poll,
+        .poll           = atalk_poll,
         .ioctl          = atalk_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = atalk_compat_ioctl,
@@ -1851,8 +1901,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops) = {
         .sendpage       = sock_no_sendpage,
 };
 
-SOCKOPS_WRAP(atalk_dgram, PF_APPLETALK);
-
 static struct notifier_block ddp_notifier = {
         .notifier_call  = ddp_device_event,
 };