Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | wenyang.linux@foxmail ... | Subject | [PATCH v2 4/9] net: ipv6: delete these unnecessary static variables two_five_five and minus_one | Date | Sat, 9 Mar 2024 18:31:21 +0800 |
| |
From: Wen Yang <wenyang.linux@foxmail.com>
Delete unnecessary static variables (two_five_five and minux_one) and encode them directly in the table entry.
Signed-off-by: Wen Yang <wenyang.linux@foxmail.com> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Kees Cook <keescook@chromium.org> Cc: Joel Granados <j.granados@samsung.com> Cc: Christian Brauner <brauner@kernel.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: David Ahern <dsahern@kernel.org> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: linux-kernel@vger.kernel.org --- net/ipv6/addrconf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 733ace18806c..73776ff76365 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -6660,8 +6660,6 @@ static int addrconf_sysctl_disable_policy(struct ctl_table *ctl, int write, return ret; } -static int minus_one = -1; -static const int two_five_five = 255; static u32 ioam6_if_id_max = U16_MAX; static const struct ctl_table addrconf_sysctl[] = { @@ -6678,8 +6676,9 @@ static const struct ctl_table addrconf_sysctl[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *)SYSCTL_ONE, - .extra2 = (void *)&two_five_five, + .min = SYSCTL_NUMERIC_ONE, + .max = SYSCTL_NUMERIC_U8_MAX, + .extra_flags = SYSCTL_TABLE_EXTRA_LONG_INIT_MINMAX, }, { .procname = "mtu", @@ -6722,7 +6721,8 @@ static const struct ctl_table addrconf_sysctl[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = &minus_one, + .min = SYSCTL_NUMERIC_NEG_ONE, + .extra_flags = SYSCTL_TABLE_EXTRA_LONG_INIT_MIN, }, { .procname = "router_solicitation_interval", @@ -7061,8 +7061,9 @@ static const struct ctl_table addrconf_sysctl[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_dointvec_minmax, - .extra1 = (void *)SYSCTL_ZERO, - .extra2 = (void *)&two_five_five, + .min = SYSCTL_NUMERIC_ZERO, + .max = SYSCTL_NUMERIC_U8_MAX, + .extra_flags = SYSCTL_TABLE_EXTRA_LONG_INIT_MINMAX, }, { .procname = "rpl_seg_enabled", -- 2.25.1
| ![\](/images/icornerr.gif) |