---

yaml --- r: 159311 b: refs/heads/master c: db71789 h: refs/heads/master i: 159309: 9a09769 159307: a968f26 159303: 5ec1896 159295: 3a34d69 v: v3
git-mirror · Aug 5, 2009 · 1a0ca14 · 1a0ca14
1 parent 9ace738
commit 1a0ca14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f816700aa9ef1b1e2f984f638cb211e79dcab495
+refs/heads/master: db71789c01ae7b641f83c5aa64e7df25122f4b28
diff --git a/trunk/net/ipv6/xfrm6_policy.c b/trunk/net/ipv6/xfrm6_policy.c
@@ -306,6 +306,7 @@ static void xfrm6_policy_fini(void)
 	xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo);
 }
 
+#ifdef CONFIG_SYSCTL
 static struct ctl_table xfrm6_policy_table[] = {
 	{
 		.ctl_name       = CTL_UNNUMBERED,
@@ -319,6 +320,7 @@ static struct ctl_table xfrm6_policy_table[] = {
 };
 
 static struct ctl_table_header *sysctl_hdr;
+#endif
 
 int __init xfrm6_init(void)
 {
@@ -345,9 +347,10 @@ int __init xfrm6_init(void)
 	 */
 	gc_thresh = FIB6_TABLE_HASHSZ * 8;
 	xfrm6_dst_ops.gc_thresh = (gc_thresh < 1024) ? 1024 : gc_thresh;
-
+#ifdef CONFIG_SYSCTL
 	sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv6_ctl_path,
 						xfrm6_policy_table);
+#endif
 out:
 	return ret;
 out_policy:
@@ -357,8 +360,10 @@ int __init xfrm6_init(void)
 
 void xfrm6_fini(void)
 {
+#ifdef CONFIG_SYSCTL
 	if (sysctl_hdr)
 		unregister_net_sysctl_table(sysctl_hdr);
+#endif
 	//xfrm6_input_fini();
 	xfrm6_policy_fini();
 	xfrm6_state_fini();