Merge branch 'drm-ttm-pool' into drm-core-next

[mv-sheeva.git] / net / decnet / netfilter / dn_rtmsg.c

diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index f7fba7721e639812e89f1c75d00b4ebaca9a1581..64a7f39e069fbc82e7e4a1bf2a50981e92d30949 100644 (file)
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -14,6 +14,7 @@
  */
 #include <linux/module.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/netfilter.h>
@@ -88,12 +89,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,7 +116,7 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb)
        RCV_SKB_FAIL(-EINVAL);
 }
 
-static struct nf_hook_ops dnrmg_ops = {
+static struct nf_hook_ops dnrmg_ops __read_mostly = {
        .hook           = dnrmg_hook,
        .pf             = PF_DECnet,
        .hooknum        = NF_DN_ROUTE,
@@ -137,7 +138,7 @@ static int __init dn_rtmsg_init(void)
 
        rv = nf_register_hook(&dnrmg_ops);
        if (rv) {
-               sock_release(dnrmg->sk_socket);
+               netlink_kernel_release(dnrmg);
        }
 
        return rv;
@@ -146,7 +147,7 @@ static int __init dn_rtmsg_init(void)
 static void __exit dn_rtmsg_fini(void)
 {
        nf_unregister_hook(&dnrmg_ops);
-       sock_release(dnrmg->sk_socket);
+       netlink_kernel_release(dnrmg);
 }