From 1a0ca14d29fde64ca7211c1cc0dba70d06ff99de Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 4 Aug 2009 20:32:16 -0700
Subject: [PATCH] --- yaml --- r: 159311 b: refs/heads/master c:
 db71789c01ae7b641f83c5aa64e7df25122f4b28 h: refs/heads/master i:   159309:
 9a0976963b954d150b17f0f9c6009719fa43268f   159307:
 a968f26ca3cec8c9975567b50ac1bdae75a4b781   159303:
 5ec18967293cf6b5d8384e396c27a9b0d6a25e06   159295:
 3a34d69bdcc6536e792bf53a49cfde355c1463e6 v: v3

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

diff --git a/[refs] b/[refs]
index 97e3a43590ec..9f4057660c1a 100644
--- 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
index 611cffcf554f..8ec3d45cd1d9 100644
--- 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();