mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
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>
This commit is contained in:
commit
3696e140c2
@ -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;
|
||||
};
|
||||
|
@ -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,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user