From 152cbba509eec1fa6de7923267d005af4b28515b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 26 Oct 2010 09:08:53 -0700
Subject: [PATCH] --- yaml --- r: 218423 b: refs/heads/master c:
 7932c2e55c707350ac166effea2f49afe2e47400 h: refs/heads/master i:   218421:
 1dfc739214ce5966d97cd48463b5f7d73d897218   218419:
 4500b4269297571260e88d8dbcf1d4f96db8c1fb   218415:
 5baaf70bdd4df590498a276ac474a89e7b0c6e9a v: v3

---
 [refs]                                        | 2 +-
 trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b3c9c8368d2..5f8b33a3eff5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10d8c4638c5a797baad5846a3447c0ccca8986a3
+refs/heads/master: 7932c2e55c707350ac166effea2f49afe2e47400
diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
index 489d71b844ac..3a3f129a44cb 100644
--- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -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;