diff options
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 62 | 
1 files changed, 31 insertions, 31 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ff7ae05f72e..07ee758de9e 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4030,8 +4030,8 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.forwarding,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&addrconf_sysctl_forward, -			.strategy	=	&addrconf_sysctl_forward_strategy, +			.proc_handler	=	addrconf_sysctl_forward, +			.strategy	=	addrconf_sysctl_forward_strategy,  		},  		{  			.ctl_name	=	NET_IPV6_HOP_LIMIT, @@ -4047,7 +4047,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.mtu6,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_ACCEPT_RA, @@ -4055,7 +4055,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_ra,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_ACCEPT_REDIRECTS, @@ -4063,7 +4063,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_redirects,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_AUTOCONF, @@ -4071,7 +4071,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.autoconf,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_DAD_TRANSMITS, @@ -4079,7 +4079,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.dad_transmits,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_RTR_SOLICITS, @@ -4087,7 +4087,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.rtr_solicits,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_RTR_SOLICIT_INTERVAL, @@ -4095,8 +4095,8 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.rtr_solicit_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_RTR_SOLICIT_DELAY, @@ -4104,8 +4104,8 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.rtr_solicit_delay,  			.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_FORCE_MLD_VERSION, @@ -4113,7 +4113,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.force_mld_version,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  #ifdef CONFIG_IPV6_PRIVACY  		{ @@ -4122,7 +4122,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.use_tempaddr,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_TEMP_VALID_LFT, @@ -4130,7 +4130,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.temp_valid_lft,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_TEMP_PREFERED_LFT, @@ -4138,7 +4138,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.temp_prefered_lft,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_REGEN_MAX_RETRY, @@ -4146,7 +4146,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.regen_max_retry,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_MAX_DESYNC_FACTOR, @@ -4154,7 +4154,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.max_desync_factor,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  #endif  		{ @@ -4163,7 +4163,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.max_addresses,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_ACCEPT_RA_DEFRTR, @@ -4171,7 +4171,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_ra_defrtr,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_ACCEPT_RA_PINFO, @@ -4179,7 +4179,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_ra_pinfo,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  #ifdef CONFIG_IPV6_ROUTER_PREF  		{ @@ -4188,7 +4188,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_ra_rtr_pref,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_RTR_PROBE_INTERVAL, @@ -4196,8 +4196,8 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.rtr_probe_interval,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec_jiffies, -			.strategy	=	&sysctl_jiffies, +			.proc_handler	=	proc_dointvec_jiffies, +			.strategy	=	sysctl_jiffies,  		},  #ifdef CONFIG_IPV6_ROUTE_INFO  		{ @@ -4206,7 +4206,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_ra_rt_info_max_plen,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  #endif  #endif @@ -4216,7 +4216,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.proxy_ndp,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	NET_IPV6_ACCEPT_SOURCE_ROUTE, @@ -4224,7 +4224,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_source_route,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  #ifdef CONFIG_IPV6_OPTIMISTIC_DAD  		{ @@ -4233,7 +4233,7 @@ static struct addrconf_sysctl_table  			.data           =       &ipv6_devconf.optimistic_dad,  			.maxlen         =       sizeof(int),  			.mode           =       0644, -			.proc_handler   =       &proc_dointvec, +			.proc_handler   =       proc_dointvec,  		},  #endif @@ -4244,7 +4244,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.mc_forwarding,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  #endif  		{ @@ -4253,7 +4253,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.disable_ipv6,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	CTL_UNNUMBERED, @@ -4261,7 +4261,7 @@ static struct addrconf_sysctl_table  			.data		=	&ipv6_devconf.accept_dad,  			.maxlen		=	sizeof(int),  			.mode		=	0644, -			.proc_handler	=	&proc_dointvec, +			.proc_handler	=	proc_dointvec,  		},  		{  			.ctl_name	=	0,	/* sentinel */  |