diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-03 18:21:05 -0800 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-03 18:21:05 -0800 | 
| commit | 6d9f239a1edb31d6133230f478fd1dc2da338ec5 (patch) | |
| tree | 305fa0da95a49db4e342f3f3042f8be0968b03ce /net/ipv6/route.c | |
| parent | 6cf3f41e6c08bca6641a695449791c38a25f35ff (diff) | |
| download | olio-linux-3.10-6d9f239a1edb31d6133230f478fd1dc2da338ec5.tar.xz olio-linux-3.10-6d9f239a1edb31d6133230f478fd1dc2da338ec5.zip  | |
net: '&' redux
I want to compile out proc_* and sysctl_* handlers totally and
stub them to NULL depending on config options, however usage of &
will prevent this, since taking adress of NULL pointer will break
compilation.
So, drop & in front of every ->proc_handler and every ->strategy
handler, it was never needed in fact.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 34 | 
1 files changed, 17 insertions, 17 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d69fa462d3f..4d40dc214b2 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2499,7 +2499,7 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.flush_delay,  		.maxlen		=	sizeof(int),  		.mode		=	0200, -		.proc_handler	=	&ipv6_sysctl_rtcache_flush +		.proc_handler	=	ipv6_sysctl_rtcache_flush  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_GC_THRESH, @@ -2507,7 +2507,7 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&ip6_dst_ops_template.gc_thresh,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec, +		.proc_handler	=	proc_dointvec,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_MAX_SIZE, @@ -2515,7 +2515,7 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_max_size,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec, +		.proc_handler	=	proc_dointvec,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_GC_MIN_INTERVAL, @@ -2523,8 +2523,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_gc_min_interval,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_jiffies, -		.strategy	=	&sysctl_jiffies, +		.proc_handler	=	proc_dointvec_jiffies, +		.strategy	=	sysctl_jiffies,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_GC_TIMEOUT, @@ -2532,8 +2532,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_gc_timeout,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_jiffies, -		.strategy	=	&sysctl_jiffies, +		.proc_handler	=	proc_dointvec_jiffies, +		.strategy	=	sysctl_jiffies,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_GC_INTERVAL, @@ -2541,8 +2541,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_gc_interval,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_jiffies, -		.strategy	=	&sysctl_jiffies, +		.proc_handler	=	proc_dointvec_jiffies, +		.strategy	=	sysctl_jiffies,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_GC_ELASTICITY, @@ -2550,8 +2550,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_gc_elasticity,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_jiffies, -		.strategy	=	&sysctl_jiffies, +		.proc_handler	=	proc_dointvec_jiffies, +		.strategy	=	sysctl_jiffies,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_MTU_EXPIRES, @@ -2559,8 +2559,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_mtu_expires,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_jiffies, -		.strategy	=	&sysctl_jiffies, +		.proc_handler	=	proc_dointvec_jiffies, +		.strategy	=	sysctl_jiffies,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_MIN_ADVMSS, @@ -2568,8 +2568,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_min_advmss,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_jiffies, -		.strategy	=	&sysctl_jiffies, +		.proc_handler	=	proc_dointvec_jiffies, +		.strategy	=	sysctl_jiffies,  	},  	{  		.ctl_name	=	NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS, @@ -2577,8 +2577,8 @@ ctl_table ipv6_route_table_template[] = {  		.data		=	&init_net.ipv6.sysctl.ip6_rt_gc_min_interval,  		.maxlen		=	sizeof(int),  		.mode		=	0644, -		.proc_handler	=	&proc_dointvec_ms_jiffies, -		.strategy	=	&sysctl_ms_jiffies, +		.proc_handler	=	proc_dointvec_ms_jiffies, +		.strategy	=	sysctl_ms_jiffies,  	},  	{ .ctl_name = 0 }  };  |