Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / net / netlink / genetlink.c

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 3f1104dc128bbe5b33eb1c44dfa96d167abcb3e6..150579a21469d664563dfcee8bdef5d3f0e355e1 100644 (file)
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -470,15 +470,11 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
        return ops->doit(skb, &info);
 }
 
-static void genl_rcv(struct sock *sk, int len)
+static void genl_rcv(struct sk_buff *skb)
 {
-       unsigned int qlen = 0;
-
-       do {
-               genl_lock();
-               qlen = netlink_run_queue(sk, qlen, genl_rcv_msg);
-               genl_unlock();
-       } while (qlen && genl_sock && genl_sock->sk_receive_queue.qlen);
+       genl_lock();
+       netlink_rcv_skb(skb, &genl_rcv_msg);
+       genl_unlock();
 }
 
 /**************************************************************************