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

[linux-2.6] / net / decnet / netfilter / dn_rtmsg.c

diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index ebb38feb4df3b8e0e49ab5c856fe0c4615e0c084..f7fba7721e639812e89f1c75d00b4ebaca9a1581 100644 (file)
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -115,17 +115,6 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
        RCV_SKB_FAIL(-EINVAL);
 }
 
-static void dnrmg_receive_user_sk(struct sock *sk, int len)
-{
-       struct sk_buff *skb;
-       unsigned int qlen = skb_queue_len(&sk->sk_receive_queue);
-
-       for (; qlen && (skb = skb_dequeue(&sk->sk_receive_queue)); qlen--) {
-               dnrmg_receive_user_skb(skb);
-               kfree_skb(skb);
-       }
-}
-
 static struct nf_hook_ops dnrmg_ops = {
        .hook           = dnrmg_hook,
        .pf             = PF_DECnet,
@@ -139,7 +128,8 @@ static int __init dn_rtmsg_init(void)
 
        dnrmg = netlink_kernel_create(&init_net,
                                      NETLINK_DNRTMSG, DNRNG_NLGRP_MAX,
-                                     dnrmg_receive_user_sk, NULL, THIS_MODULE);
+                                     dnrmg_receive_user_skb,
+                                     NULL, THIS_MODULE);
        if (dnrmg == NULL) {
                printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
                return -ENOMEM;