Kernel: T5887: forward patch linkstate-ip-device-attribute for 6.6.21

This commit is contained in:
Christian Breunig 2024-03-07 22:00:44 +01:00
parent 089b595605
commit 016809208d

View File

@ -100,10 +100,10 @@ index bc74f131fe4d..9cdd5b50f9b2 100644
}; };
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 7881446a46c4..f3c7a2e0902d 100644 index 6f57cbddeee6..6ea474d2c170 100644
--- a/net/ipv6/addrconf.c --- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c
@@ -5654,6 +5654,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, @@ -5655,6 +5655,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier; array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na; array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft; array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
@ -111,7 +111,7 @@ index 7881446a46c4..f3c7a2e0902d 100644
} }
static inline size_t inet6_ifla6_size(void) static inline size_t inet6_ifla6_size(void)
@@ -7082,6 +7083,13 @@ static const struct ctl_table addrconf_sysctl[] = { @@ -7083,6 +7084,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO, .extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE, .extra2 = (void *)SYSCTL_ONE,
}, },