diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-03 08:55:45 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-03 08:55:45 +0300 |
| commit | 3696e140c25f5a2af763505aff99d14c0661cede (patch) | |
| tree | d4aff0f197679a9d394ee3c329b1220484d82b7b | |
| parent | 37a826d86ff746c4eac8bd3415af19f3c9598206 (diff) | |
| parent | ef62c0ae6db11c095880e473db9f846132d7eba8 (diff) | |
| download | linux-3696e140c25f5a2af763505aff99d14c0661cede.tar.xz | |
Merge branch 'net-ipv6-skip_notify_on_dev_down-fix'
Eric Dumazet says:
====================
net/ipv6: skip_notify_on_dev_down fix
While reviewing Matthieu Baerts recent patch [1], I found it copied/pasted
an existing bug around skip_notify_on_dev_down.
First patch is a stable candidate, and second one can simply land
in net tree.
https://lore.kernel.org/lkml/20230601-net-next-skip_print_link_becomes_ready-v1-1-c13e64c14095@tessares.net/
====================
Link: https://lore.kernel.org/r/20230601160445.1480257-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | include/net/netns/ipv6.h | 2 | ||||
| -rw-r--r-- | net/ipv6/route.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 3cceb3e9320b..5f2cfd84570a 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -53,7 +53,7 @@ struct netns_sysctl_ipv6 { int seg6_flowlabel; u32 ioam6_id; u64 ioam6_id_wide; - bool skip_notify_on_dev_down; + u8 skip_notify_on_dev_down; u8 fib_notify_on_flag_change; u8 icmpv6_error_anycast_as_unicast; }; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e3aec46bd466..392aaa373b66 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -6412,9 +6412,9 @@ static struct ctl_table ipv6_route_table_template[] = { { .procname = "skip_notify_on_dev_down", .data = &init_net.ipv6.sysctl.skip_notify_on_dev_down, - .maxlen = sizeof(int), + .maxlen = sizeof(u8), .mode = 0644, - .proc_handler = proc_dointvec_minmax, + .proc_handler = proc_dou8vec_minmax, .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, |