| Message ID | 1474969963-17402-3-git-send-email-zenczykowski@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi, Maciej Żenczykowski wrote: > From: Maciej Żenczykowski <maze@google.com> > > replace with extra1/2 magic > > Signed-off-by: Maciej Żenczykowski <maze@google.com> > --- > net/ipv6/addrconf.c | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c > index 11fa1a5564d4..8bd2d06eefe7 100644 > --- a/net/ipv6/addrconf.c > +++ b/net/ipv6/addrconf.c > @@ -5467,20 +5467,6 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write, > } > > static > -int addrconf_sysctl_hop_limit(struct ctl_table *ctl, int write, > - void __user *buffer, size_t *lenp, loff_t *ppos) > -{ > - struct ctl_table lctl; > - int min_hl = 1, max_hl = 255; > - > - lctl = *ctl; > - lctl.extra1 = &min_hl; > - lctl.extra2 = &max_hl; > - > - return proc_dointvec_minmax(&lctl, write, buffer, lenp, ppos); > -} > - > -static > int addrconf_sysctl_mtu(struct ctl_table *ctl, int write, > void __user *buffer, size_t *lenp, loff_t *ppos) > { > @@ -5713,6 +5699,9 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl, > return ret; > } > > +static const int one = 1; > +static const int two_five_five = 255; > + > static const struct ctl_table addrconf_sysctl[] = { > { > .procname = "forwarding", > @@ -5726,7 +5715,9 @@ static const struct ctl_table addrconf_sysctl[] = { > .data = &ipv6_devconf.hop_limit, > .maxlen = sizeof(int), > .mode = 0644, > - .proc_handler = addrconf_sysctl_hop_limit, > + .proc_handler = proc_dointvec_minmax, > + .extra1 = (void *)&one, > + .extra2 = (void *)&two_five_five, > }, > { > .procname = "mtu", > Please submit this in a different series of patches (like 1/7). --yoshfuji
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 11fa1a5564d4..8bd2d06eefe7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5467,20 +5467,6 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write, } static -int addrconf_sysctl_hop_limit(struct ctl_table *ctl, int write, - void __user *buffer, size_t *lenp, loff_t *ppos) -{ - struct ctl_table lctl; - int min_hl = 1, max_hl = 255; - - lctl = *ctl; - lctl.extra1 = &min_hl; - lctl.extra2 = &max_hl; - - return proc_dointvec_minmax(&lctl, write, buffer, lenp, ppos); -} - -static int addrconf_sysctl_mtu(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -5713,6 +5699,9 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl, return ret; } +static const int one = 1; +static const int two_five_five = 255; + static const struct ctl_table addrconf_sysctl[] = { { .procname = "forwarding", @@ -5726,7 +5715,9 @@ static const struct ctl_table addrconf_sysctl[] = { .data = &ipv6_devconf.hop_limit, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = addrconf_sysctl_hop_limit, + .proc_handler = proc_dointvec_minmax, + .extra1 = (void *)&one, + .extra2 = (void *)&two_five_five, }, { .procname = "mtu",