git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[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
7104536
..
1e75b15
100644
(file)
--- a/
net/core/sysctl_net_core.c
+++ b/
net/core/sysctl_net_core.c
@@
-7,7
+7,6
@@
#include <linux/mm.h>
#include <linux/sysctl.h>
#include <linux/mm.h>
#include <linux/sysctl.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/socket.h>
#include <net/sock.h>
#include <linux/module.h>
#include <linux/socket.h>
#include <net/sock.h>
@@
-22,10
+21,6
@@
extern __u32 sysctl_rmem_max;
extern int sysctl_core_destroy_delay;
extern int sysctl_core_destroy_delay;
-#ifdef CONFIG_NET_DIVERT
-extern char sysctl_divert_version[];
-#endif /* CONFIG_NET_DIVERT */
-
#ifdef CONFIG_XFRM
extern u32 sysctl_xfrm_aevent_etime;
extern u32 sysctl_xfrm_aevent_rseqth;
#ifdef CONFIG_XFRM
extern u32 sysctl_xfrm_aevent_etime;
extern u32 sysctl_xfrm_aevent_rseqth;
@@
-106,16
+101,6
@@
ctl_table core_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec
},
.mode = 0644,
.proc_handler = &proc_dointvec
},
-#ifdef CONFIG_NET_DIVERT
- {
- .ctl_name = NET_CORE_DIVERT_VERSION,
- .procname = "divert_version",
- .data = (void *)sysctl_divert_version,
- .maxlen = 32,
- .mode = 0444,
- .proc_handler = &proc_dostring
- },
-#endif /* CONFIG_NET_DIVERT */
#ifdef CONFIG_XFRM
{
.ctl_name = NET_CORE_AEVENT_ETIME,
#ifdef CONFIG_XFRM
{
.ctl_name = NET_CORE_AEVENT_ETIME,