leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfrm6: Fix xfrm6_policy.c build when SYSCTL disabled.

Browse Source 
Same as how Randy Dunlap fixed the ipv4 side of things.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2009-08-04 20:32:16 -07:00
parent f816700aa9
commit db71789c01
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv6/xfrm6_policy.c
View File

@@ -306,6 +306,7 @@ static void xfrm6_policy_fini(void)
xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo); xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo);
} }
#ifdef CONFIG_SYSCTL
static struct ctl_table xfrm6_policy_table[] = { static struct ctl_table xfrm6_policy_table[] = {
{ {
.ctl_name = CTL_UNNUMBERED, .ctl_name = CTL_UNNUMBERED,
@@ -319,6 +320,7 @@ static struct ctl_table xfrm6_policy_table[] = {
}; };
static struct ctl_table_header *sysctl_hdr; static struct ctl_table_header *sysctl_hdr;
#endif
int __init xfrm6_init(void) int __init xfrm6_init(void)
{ {
@@ -345,9 +347,10 @@ int __init xfrm6_init(void)
*/ */
gc_thresh = FIB6_TABLE_HASHSZ * 8; gc_thresh = FIB6_TABLE_HASHSZ * 8;
xfrm6_dst_ops.gc_thresh = (gc_thresh < 1024) ? 1024 : gc_thresh; 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, sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv6_ctl_path,
xfrm6_policy_table); xfrm6_policy_table);
#endif
out: out:
return ret; return ret;
out_policy: out_policy:
@@ -357,8 +360,10 @@ out_policy:
void xfrm6_fini(void) void xfrm6_fini(void)
{ {
#ifdef CONFIG_SYSCTL
if (sysctl_hdr) if (sysctl_hdr)
unregister_net_sysctl_table(sysctl_hdr); unregister_net_sysctl_table(sysctl_hdr);
#endif
//xfrm6_input_fini(); //xfrm6_input_fini();
xfrm6_policy_fini(); xfrm6_policy_fini();
xfrm6_state_fini(); xfrm6_state_fini();