Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

[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 696234688cf6fb7003613749a1c98b15f3623e8b..43fcd29046d1f30b14a60569284ef0ab4afa69d3 100644 (file)
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -88,12 +88,12 @@ static void dnrmg_send_peer(struct sk_buff *skb)
 
 
 static unsigned int dnrmg_hook(unsigned int hook,
-                       struct sk_buff **pskb,
+                       struct sk_buff *skb,
                        const struct net_device *in,
                        const struct net_device *out,
                        int (*okfn)(struct sk_buff *))
 {
-       dnrmg_send_peer(*pskb);
+       dnrmg_send_peer(skb);
        return NF_ACCEPT;
 }
 
@@ -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,
@@ -137,8 +126,10 @@ static int __init dn_rtmsg_init(void)
 {
        int rv = 0;
 
-       dnrmg = netlink_kernel_create(NETLINK_DNRTMSG, DNRNG_NLGRP_MAX,
-                                     dnrmg_receive_user_sk, NULL, THIS_MODULE);
+       dnrmg = netlink_kernel_create(&init_net,
+                                     NETLINK_DNRTMSG, DNRNG_NLGRP_MAX,
+                                     dnrmg_receive_user_skb,
+                                     NULL, THIS_MODULE);
        if (dnrmg == NULL) {
                printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
                return -ENOMEM;