@@ -101,18 +101,18 @@ index c33b1ecc591e..7576d51cd16d 100644
101101 };
102102
103103diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104- index 231fa4dc6cde..8d8a8ee9c4fe 100644
104+ index 1c3b0ba289fb..075da0727e7d 100644
105105--- a/net/ipv6/addrconf.c
106106+++ b/net/ipv6/addrconf.c
107- @@ -5677 ,6 +5677 ,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
107+ @@ -5671 ,6 +5671 ,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
108108 array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
109109 array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
110110 array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
111111+ array[DEVCONF_LINK_FILTER] = cnf->link_filter;
112112 }
113113
114114 static inline size_t inet6_ifla6_size(void)
115- @@ -7119 ,6 +7120 ,13 @@ static const struct ctl_table addrconf_sysctl[] = {
115+ @@ -7113 ,6 +7114 ,13 @@ static const struct ctl_table addrconf_sysctl[] = {
116116 .extra1 = (void *)SYSCTL_ZERO,
117117 .extra2 = (void *)SYSCTL_ONE,
118118 },
@@ -127,7 +127,7 @@ index 231fa4dc6cde..8d8a8ee9c4fe 100644
127127 .procname = "ioam6_id",
128128 .data = &ipv6_devconf.ioam6_id,
129129diff --git a/net/ipv6/route.c b/net/ipv6/route.c
130- index 53197087353a..4fed0253cf83 100644
130+ index eb9e505f71f9..bdcbaf43bf6d 100644
131131--- a/net/ipv6/route.c
132132+++ b/net/ipv6/route.c
133133@@ -716,6 +716,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
0 commit comments