summaryrefslogtreecommitdiff
path: root/packages/linux-kernel
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-03-07 22:00:44 +0100
committerChristian Breunig <christian@breunig.cc>2024-03-07 22:01:43 +0100
commit48f7d41a60770732f28b920280b69177db4221f0 (patch)
tree62276a1dc77537abf7ec5bc34b12a765254b9a65 /packages/linux-kernel
parenta636ce2f3d3bece775e57817a3ca829f10e443f5 (diff)
downloadvyos-build-48f7d41a60770732f28b920280b69177db4221f0.tar.gz
vyos-build-48f7d41a60770732f28b920280b69177db4221f0.zip
Kernel: T5887: forward patch linkstate-ip-device-attribute for 6.6.211.4.0-epa2
(cherry picked from commit 016809208da4d5500734f275d544463d8122bbd1)
Diffstat (limited to 'packages/linux-kernel')
-rw-r--r--packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 3987d630..e678a63e 100644
--- a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -100,10 +100,10 @@ index bc74f131fe4d..9cdd5b50f9b2 100644
};
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
+++ 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_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
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)
-@@ -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,
.extra2 = (void *)SYSCTL_ONE,
},