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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 39 insertions, 72 deletions

diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 4bf9aa547c78..40579edca101 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -64,7 +64,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
 
                 if (nlh->nlmsg_type != SCSI_TRANSPORT_MSG) {
                         err = -EBADMSG;
-                        goto next_msg;
+                        return;
                 }
 
                 hdr = NLMSG_DATA(nlh);
@@ -99,27 +99,6 @@ next_msg:
 
 
 /**
- * scsi_nl_rcv_msg -
- *    Receive handler for a socket. Extracts a received message buffer from
- *    the socket, and starts message processing.
- *
- * @sk:         socket
- * @len:        unused
- *
- **/
-static void
-scsi_nl_rcv(struct sock *sk, int len)
-{
-        struct sk_buff *skb;
-
-        while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
-                scsi_nl_rcv_msg(skb);
-                kfree_skb(skb);
-        }
-}
-
-
-/**
  * scsi_nl_rcv_event -
  *    Event handler for a netlink socket.
  *
@@ -167,8 +146,8 @@ scsi_netlink_init(void)
                 return;
         }
 
-        scsi_nl_sock = netlink_kernel_create(NETLINK_SCSITRANSPORT,
-                                SCSI_NL_GRP_CNT, scsi_nl_rcv, NULL,
+        scsi_nl_sock = netlink_kernel_create(&init_net, NETLINK_SCSITRANSPORT,
+                                SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
                                 THIS_MODULE);
         if (!scsi_nl_sock) {
                 printk(KERN_ERR "%s: register of recieve handler failed\n",
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 34c1860a259d..5428d15f23c6 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1097,61 +1097,49 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 }
 
 /*
- * Get message from skb (based on rtnetlink_rcv_skb).  Each message is
- * processed by iscsi_if_recv_msg.  Malformed skbs with wrong lengths or
- * invalid creds are discarded silently.
+ * Get message from skb.  Each message is processed by iscsi_if_recv_msg.
+ * Malformed skbs with wrong lengths or invalid creds are not processed.
  */
 static void
-iscsi_if_rx(struct sock *sk, int len)
+iscsi_if_rx(struct sk_buff *skb)
 {
-        struct sk_buff *skb;
-
         mutex_lock(&rx_queue_mutex);
-        while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
-                if (NETLINK_CREDS(skb)->uid) {
-                        skb_pull(skb, skb->len);
-                        goto free_skb;
+        while (skb->len >= NLMSG_SPACE(0)) {
+                int err;
+                uint32_t rlen;
+                struct nlmsghdr *nlh;
+                struct iscsi_uevent *ev;
+
+                nlh = nlmsg_hdr(skb);
+                if (nlh->nlmsg_len < sizeof(*nlh) ||
+                    skb->len < nlh->nlmsg_len) {
+                        break;
                 }
 
-                while (skb->len >= NLMSG_SPACE(0)) {
-                        int err;
-                        uint32_t rlen;
-                        struct nlmsghdr *nlh;
-                        struct iscsi_uevent *ev;
+                ev = NLMSG_DATA(nlh);
+                rlen = NLMSG_ALIGN(nlh->nlmsg_len);
+                if (rlen > skb->len)
+                        rlen = skb->len;
 
-                        nlh = nlmsg_hdr(skb);
-                        if (nlh->nlmsg_len < sizeof(*nlh) ||
-                            skb->len < nlh->nlmsg_len) {
-                                break;
-                        }
-
-                        ev = NLMSG_DATA(nlh);
-                        rlen = NLMSG_ALIGN(nlh->nlmsg_len);
-                        if (rlen > skb->len)
-                                rlen = skb->len;
-
-                        err = iscsi_if_recv_msg(skb, nlh);
-                        if (err) {
-                                ev->type = ISCSI_KEVENT_IF_ERROR;
-                                ev->iferror = err;
-                        }
-                        do {
-                                /*
-                                 * special case for GET_STATS:
-                                 * on success - sending reply and stats from
-                                 * inside of if_recv_msg(),
-                                 * on error - fall through.
-                                 */
-                                if (ev->type == ISCSI_UEVENT_GET_STATS && !err)
-                                        break;
-                                err = iscsi_if_send_reply(
-                                        NETLINK_CREDS(skb)->pid, nlh->nlmsg_seq,
-                                        nlh->nlmsg_type, 0, 0, ev, sizeof(*ev));
-                        } while (err < 0 && err != -ECONNREFUSED);
-                        skb_pull(skb, rlen);
+                err = iscsi_if_recv_msg(skb, nlh);
+                if (err) {
+                        ev->type = ISCSI_KEVENT_IF_ERROR;
+                        ev->iferror = err;
                 }
-free_skb:
-                kfree_skb(skb);
+                do {
+                        /*
+                         * special case for GET_STATS:
+                         * on success - sending reply and stats from
+                         * inside of if_recv_msg(),
+                         * on error - fall through.
+                         */
+                        if (ev->type == ISCSI_UEVENT_GET_STATS && !err)
+                                break;
+                        err = iscsi_if_send_reply(
+                                NETLINK_CREDS(skb)->pid, nlh->nlmsg_seq,
+                                nlh->nlmsg_type, 0, 0, ev, sizeof(*ev));
+                } while (err < 0 && err != -ECONNREFUSED);
+                skb_pull(skb, rlen);
         }
         mutex_unlock(&rx_queue_mutex);
 }
@@ -1523,7 +1511,7 @@ static __init int iscsi_transport_init(void)
         if (err)
                 goto unregister_conn_class;
 
-        nls = netlink_kernel_create(NETLINK_ISCSI, 1, iscsi_if_rx, NULL,
+        nls = netlink_kernel_create(&init_net, NETLINK_ISCSI, 1, iscsi_if_rx, NULL,
                         THIS_MODULE);
         if (!nls) {
                 err = -ENOBUFS;