patch-2.1.32 linux/net/ipv6/ipv6_sockglue.c

Next file: linux/net/ipv6/sysctl_net_ipv6.c
Previous file: linux/net/ipv4/sysctl_net_ipv4.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.31/linux/net/ipv6/ipv6_sockglue.c linux/net/ipv6/ipv6_sockglue.c
@@ -228,7 +228,7 @@
 	return 0;
 }
 
-#ifdef MODULE
+#if defined(MODULE) && defined(CONFIG_SYSCTL)
 
 /*
  *	sysctl registration functions defined in sysctl_net_ipv6.c
@@ -244,7 +244,7 @@
 
 	dev_add_pack(&ipv6_packet_type);
 
-#ifdef MODULE
+#if defined(MODULE) && defined(CONFIG_SYSCTL)
 	ipv6_sysctl_register();
 #endif
 
@@ -258,9 +258,13 @@
 {
 	unregister_netdevice_notifier(&ipv6_dev_notf);
 	dev_remove_pack(&ipv6_packet_type);
+#ifdef CONFIG_SYSCTL
 	ipv6_sysctl_unregister();	
+#endif
 	ip6_route_cleanup();
 	ndisc_cleanup();
 	addrconf_cleanup();	
 }
 #endif
+
+

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov