]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
netfilter: Add missing CONFIG_SYSCTL checks in ipv6's nf_conntrack_reasm.c
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Oct 2010 16:08:53 +0000 (09:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Oct 2010 16:08:53 +0000 (09:08 -0700)
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/netfilter/nf_conntrack_reasm.c

index 489d71b844ac9ba7c85d7f5612922e4ceeb712cc..3a3f129a44cb3561dd3e135164626f8352c565b7 100644 (file)
@@ -625,21 +625,24 @@ int nf_ct_frag6_init(void)
        inet_frags_init_net(&nf_init_frags);
        inet_frags_init(&nf_frags);
 
+#ifdef CONFIG_SYSCTL
        nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path,
                                                          nf_ct_frag6_sysctl_table);
        if (!nf_ct_frag6_sysctl_header) {
                inet_frags_fini(&nf_frags);
                return -ENOMEM;
        }
+#endif
 
        return 0;
 }
 
 void nf_ct_frag6_cleanup(void)
 {
+#ifdef CONFIG_SYSCTL
        unregister_sysctl_table(nf_ct_frag6_sysctl_header);
        nf_ct_frag6_sysctl_header = NULL;
-
+#endif
        inet_frags_fini(&nf_frags);
 
        nf_init_frags.low_thresh = 0;