Merge bk://are.twiddle.net/axp-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

1 files changed, 110 insertions, 110 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 74422ccb7b..c4fe2f58d6 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2409,149 +2409,149 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table, int *name,
 
 ctl_table ipv4_route_table[] = {
         {
-		.ctl_name =	NET_IPV4_ROUTE_FLUSH,
-		.procname =	"flush",
-		.data =	&flush_delay,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&ipv4_sysctl_rtcache_flush,
-		.strategy =	&ipv4_sysctl_rtcache_flush_strategy,
+		.ctl_name 	= NET_IPV4_ROUTE_FLUSH,
+		.procname	= "flush",
+		.data		= &flush_delay,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &ipv4_sysctl_rtcache_flush,
+		.strategy	= &ipv4_sysctl_rtcache_flush_strategy,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_MIN_DELAY,
-		.procname =	"min_delay",
-		.data =	&ip_rt_min_delay,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec_jiffies,
-		.strategy =	&sysctl_jiffies,
+		.ctl_name	= NET_IPV4_ROUTE_MIN_DELAY,
+		.procname	= "min_delay",
+		.data		= &ip_rt_min_delay,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+		.strategy	= &sysctl_jiffies,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_MAX_DELAY,
-		.procname =	"max_delay",
-		.data =	&ip_rt_max_delay,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec_jiffies,
-		.strategy =	&sysctl_jiffies,
+		.ctl_name	= NET_IPV4_ROUTE_MAX_DELAY,
+		.procname	= "max_delay",
+		.data		= &ip_rt_max_delay,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+		.strategy	= &sysctl_jiffies,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_GC_THRESH,
-		.procname =	"gc_thresh",
-		.data =	&ipv4_dst_ops.gc_thresh,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_GC_THRESH,
+		.procname	= "gc_thresh",
+		.data		= &ipv4_dst_ops.gc_thresh,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_MAX_SIZE,
-		.procname =	"max_size",
-		.data =	&ip_rt_max_size,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_MAX_SIZE,
+		.procname	= "max_size",
+		.data		= &ip_rt_max_size,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_GC_MIN_INTERVAL,
-		.procname =	"gc_min_interval",
-		.data =	&ip_rt_gc_min_interval,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec_jiffies,
-		.strategy =	&sysctl_jiffies,
+		.ctl_name	= NET_IPV4_ROUTE_GC_MIN_INTERVAL,
+		.procname	= "gc_min_interval",
+		.data		= &ip_rt_gc_min_interval,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+		.strategy	= &sysctl_jiffies,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_GC_TIMEOUT,
-		.procname =	"gc_timeout",
-		.data =	&ip_rt_gc_timeout,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec_jiffies,
-		.strategy =	&sysctl_jiffies,
+		.ctl_name	= NET_IPV4_ROUTE_GC_TIMEOUT,
+		.procname	= "gc_timeout",
+		.data		= &ip_rt_gc_timeout,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+		.strategy	= &sysctl_jiffies,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_GC_INTERVAL,
-		.procname =	"gc_interval",
-		.data =	&ip_rt_gc_interval,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec_jiffies,
-		.strategy =	&sysctl_jiffies,
+		.ctl_name	= NET_IPV4_ROUTE_GC_INTERVAL,
+		.procname	= "gc_interval",
+		.data		= &ip_rt_gc_interval,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+		.strategy	= &sysctl_jiffies,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_REDIRECT_LOAD,
-		.procname =	"redirect_load",
-		.data =	&ip_rt_redirect_load,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_REDIRECT_LOAD,
+		.procname	= "redirect_load",
+		.data		= &ip_rt_redirect_load,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_REDIRECT_NUMBER,
-		.procname =	"redirect_number",
-		.data =	&ip_rt_redirect_number,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_REDIRECT_NUMBER,
+		.procname	= "redirect_number",
+		.data		= &ip_rt_redirect_number,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_REDIRECT_SILENCE,
-		.procname =	"redirect_silence",
-		.data =	&ip_rt_redirect_silence,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_REDIRECT_SILENCE,
+		.procname	= "redirect_silence",
+		.data		= &ip_rt_redirect_silence,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_ERROR_COST,
-		.procname =	"error_cost",
-		.data =	&ip_rt_error_cost,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_ERROR_COST,
+		.procname	= "error_cost",
+		.data		= &ip_rt_error_cost,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_ERROR_BURST,
-		.procname =	"error_burst",
-		.data =	&ip_rt_error_burst,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_ERROR_BURST,
+		.procname	= "error_burst",
+		.data		= &ip_rt_error_burst,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_GC_ELASTICITY,
-		.procname =	"gc_elasticity",
-		.data =	&ip_rt_gc_elasticity,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_GC_ELASTICITY,
+		.procname	= "gc_elasticity",
+		.data		= &ip_rt_gc_elasticity,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_MTU_EXPIRES,
-		.procname =	"mtu_expires",
-		.data =	&ip_rt_mtu_expires,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec_jiffies,
-		.strategy =	&sysctl_jiffies,
+		.ctl_name	= NET_IPV4_ROUTE_MTU_EXPIRES,
+		.procname	= "mtu_expires",
+		.data		= &ip_rt_mtu_expires,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_jiffies,
+		.strategy	= &sysctl_jiffies,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_MIN_PMTU,
-		.procname =	"min_pmtu",
-		.data =	&ip_rt_min_pmtu,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_MIN_PMTU,
+		.procname	= "min_pmtu",
+		.data		= &ip_rt_min_pmtu,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name =	NET_IPV4_ROUTE_MIN_ADVMSS,
-		.procname =	"min_adv_mss",
-		.data =	&ip_rt_min_advmss,
-		.maxlen =		sizeof(int),
-		.mode =	0644,
-		.proc_handler =&proc_dointvec,
+		.ctl_name	= NET_IPV4_ROUTE_MIN_ADVMSS,
+		.procname	= "min_adv_mss",
+		.data		= &ip_rt_min_advmss,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
 	},
-	 { 0 }
+	{ .ctl_name = 0 }
 };
 #endif