Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / net / decnet / af_decnet.c

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 19acd00..16fbf8c 100644 (file)
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -2354,6 +2354,8 @@ static const struct proto_ops dn_proto_ops = {
        .sendpage =     sock_no_sendpage,
 };
 
+void dn_register_sysctl_skeleton(void);
+void dn_unregister_sysctl_skeleton(void);
 void dn_register_sysctl(void);
 void dn_unregister_sysctl(void);
 
@@ -2374,6 +2376,7 @@ static int __init decnet_init(void)
        if (rc != 0)
                goto out;
 
+       dn_register_sysctl_skeleton();
        dn_neigh_init();
        dn_dev_init();
        dn_route_init();
@@ -2413,6 +2416,7 @@ static void __exit decnet_exit(void)
        dn_fib_cleanup();
 
        proc_net_remove(&init_net, "decnet");
+       dn_unregister_sysctl_skeleton();
 
        proto_unregister(&dn_proto);