Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 99775af19ff4071ff71407dadb72ea618dc45918..2128542995f79279fb026bcc4688eef46b434305 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -169,15 +169,11 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
        }
 }
 
-static void nfnetlink_rcv(struct sock *sk, int len)
+static void nfnetlink_rcv(struct sk_buff *skb)
 {
-       unsigned int qlen = 0;
-
-       do {
-               nfnl_lock();
-               qlen = netlink_run_queue(sk, qlen, nfnetlink_rcv_msg);
-               nfnl_unlock();
-       } while (qlen);
+       nfnl_lock();
+       netlink_rcv_skb(skb, &nfnetlink_rcv_msg);
+       nfnl_unlock();
 }
 
 static void __exit nfnetlink_exit(void)