Commit 3696e140 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 37a826d8 ef62c0ae

include/net/netns/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

net/ipv6/route.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

	},