Skip to content

Commit 3696e14

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 37a826d + ef62c0a commit 3696e14

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/net/netns/ipv6.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct netns_sysctl_ipv6 {
5353
int seg6_flowlabel;
5454
u32 ioam6_id;
5555
u64 ioam6_id_wide;
56-
bool skip_notify_on_dev_down;
56+
u8 skip_notify_on_dev_down;
5757
u8 fib_notify_on_flag_change;
5858
u8 icmpv6_error_anycast_as_unicast;
5959
};

net/ipv6/route.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6412,9 +6412,9 @@ static struct ctl_table ipv6_route_table_template[] = {
64126412
{
64136413
.procname = "skip_notify_on_dev_down",
64146414
.data = &init_net.ipv6.sysctl.skip_notify_on_dev_down,
6415-
.maxlen = sizeof(int),
6415+
.maxlen = sizeof(u8),
64166416
.mode = 0644,
6417-
.proc_handler = proc_dointvec_minmax,
6417+
.proc_handler = proc_dou8vec_minmax,
64186418
.extra1 = SYSCTL_ZERO,
64196419
.extra2 = SYSCTL_ONE,
64206420
},

0 commit comments

Comments
 (0)