X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2Fsysctl_net_ipv4.c;h=6b0b74430e288662a7565119631148d1899d7213;hb=9c920a8402f2bb9bd931801d429b65f4eb6a262b;hp=90bb78a05f808501d93f833c35e3eb78a76535d4;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 90bb78a05..6b0b74430 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -23,13 +23,6 @@ extern int sysctl_ip_nonlocal_bind;
 extern int sysctl_icmp_echo_ignore_all;
 extern int sysctl_icmp_echo_ignore_broadcasts;
 extern int sysctl_icmp_ignore_bogus_error_responses;
-#ifdef CONFIG_ICMP_IPOD
-extern int sysctl_icmp_ipod_version;
-extern int sysctl_icmp_ipod_enabled;
-extern u32 sysctl_icmp_ipod_host;
-extern u32 sysctl_icmp_ipod_mask;
-extern char sysctl_icmp_ipod_key[32+1];
-#endif
 
 /* From ip_fragment.c */
 extern int sysctl_ipfrag_low_thresh;
@@ -69,12 +62,12 @@ extern ctl_table ipv4_route_table[];
 
 static
 int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
-			void __user *buffer, size_t *lenp, loff_t *ppos)
+			void __user *buffer, size_t *lenp)
 {
 	int val = ipv4_devconf.forwarding;
 	int ret;
 
-	ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
+	ret = proc_dointvec(ctl, write, filp, buffer, lenp);
 
 	if (write && ipv4_devconf.forwarding != val)
 		inet_forward_change();
@@ -402,49 +395,6 @@ ctl_table ipv4_table[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_dointvec
 	},
-#ifdef CONFIG_ICMP_IPOD
-	{
-		.ctl_name	= NET_IPV4_ICMP_IPOD_VERSION,
-		.procname	= "icmp_ipod_version",
-		.data		= &sysctl_icmp_ipod_version,
-		.maxlen		= sizeof(sysctl_icmp_ipod_version),
-		.mode		= 0444,
-		.proc_handler	= &proc_dointvec
-	},
-	{
-		.ctl_name	= NET_IPV4_ICMP_IPOD_ENABLED,
-		.procname	= "icmp_ipod_enabled",
-		.data		= &sysctl_icmp_ipod_enabled,
-		.maxlen		= sizeof(sysctl_icmp_ipod_enabled),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec
-	},
-	{
-		.ctl_name	= NET_IPV4_ICMP_IPOD_HOST,
-		.procname	= "icmp_ipod_host",
-		.data		= &sysctl_icmp_ipod_host,
-		.maxlen		= sizeof(sysctl_icmp_ipod_host),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec
-	},
-	{
-		.ctl_name	= NET_IPV4_ICMP_IPOD_MASK,
-		.procname	= "icmp_ipod_mask",
-		.data		= &sysctl_icmp_ipod_mask,
-		.maxlen		= sizeof(sysctl_icmp_ipod_mask),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec
-	},
-	{
-		.ctl_name	= NET_IPV4_ICMP_IPOD_KEY,
-		.procname	= "icmp_ipod_key",
-		.data		= &sysctl_icmp_ipod_key,
-		.maxlen		= sizeof(sysctl_icmp_ipod_key),
-		.mode		= 0600,
-		.proc_handler	= &proc_dostring,
-		.strategy	= &sysctl_string
-	},
-#endif
 	{
 		.ctl_name	= NET_IPV4_ROUTE,
 		.procname	= "route",