linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / core / sysctl_net_core.c

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 0253413..2f278c8 100644 (file)
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -7,6 +7,7 @@
 
 #include <linux/mm.h>
 #include <linux/sysctl.h>
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <net/sock.h>
@@ -25,11 +26,6 @@ extern int sysctl_core_destroy_delay;
 extern char sysctl_divert_version[];
 #endif /* CONFIG_NET_DIVERT */
 
-#ifdef CONFIG_XFRM
-extern u32 sysctl_xfrm_aevent_etime;
-extern u32 sysctl_xfrm_aevent_rseqth;
-#endif
-
 ctl_table core_table[] = {
 #ifdef CONFIG_NET
        {
@@ -115,24 +111,6 @@ ctl_table core_table[] = {
                .proc_handler   = &proc_dostring
        },
 #endif /* CONFIG_NET_DIVERT */
-#ifdef CONFIG_XFRM
-       {
-               .ctl_name       = NET_CORE_AEVENT_ETIME,
-               .procname       = "xfrm_aevent_etime",
-               .data           = &sysctl_xfrm_aevent_etime,
-               .maxlen         = sizeof(u32),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
-       },
-       {
-               .ctl_name       = NET_CORE_AEVENT_RSEQTH,
-               .procname       = "xfrm_aevent_rseqth",
-               .data           = &sysctl_xfrm_aevent_rseqth,
-               .maxlen         = sizeof(u32),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
-       },
-#endif /* CONFIG_XFRM */
 #endif /* CONFIG_NET */
        {
                .ctl_name       = NET_CORE_SOMAXCONN,