Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 07:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'net-ipv6-skip_notify_on_dev_down-fix'

Browse Source 
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>
This commit is contained in:
Jakub Kicinski 2023-06-02 22:55:45 -07:00
commit 3696e140c2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netns/ipv6.h
View File

@ -53,7 +53,7 @@ struct netns_sysctl_ipv6 {
int seg6_flowlabel; int seg6_flowlabel;
u32 ioam6_id; u32 ioam6_id;
u64 ioam6_id_wide; u64 ioam6_id_wide;
bool skip_notify_on_dev_down; u8 skip_notify_on_dev_down;
u8 fib_notify_on_flag_change; u8 fib_notify_on_flag_change;
u8 icmpv6_error_anycast_as_unicast; u8 icmpv6_error_anycast_as_unicast;
}; };

4
net/ipv6/route.c
View File

@ -6412,9 +6412,9 @@ static struct ctl_table ipv6_route_table_template[] = {
{ {
.procname = "skip_notify_on_dev_down", .procname = "skip_notify_on_dev_down",
.data = &init_net.ipv6.sysctl.skip_notify_on_dev_down, .data = &init_net.ipv6.sysctl.skip_notify_on_dev_down,
.maxlen = sizeof(int), .maxlen = sizeof(u8),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dou8vec_minmax,
.extra1 = SYSCTL_ZERO, .extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE, .extra2 = SYSCTL_ONE,
}, },