summaryrefslogtreecommitdiff
path: root/packages/linux-kernel
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-08-11 14:46:58 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-08-12 09:33:01 +0000
commit78bfc58217c1aebd4ec151b0e16af8713a8379a9 (patch)
treebd3615a5e6096028c44e5af5ae610186d7755bc6 /packages/linux-kernel
parent21b69cbb35fbada43d58583667bbcb70ec46a7cc (diff)
downloadvyos-build-mergify/bp/circinus/pr-733.tar.gz
vyos-build-mergify/bp/circinus/pr-733.zip
Kernel: T5887: update Linux Kernel to v6.6.45mergify/bp/circinus/pr-733
(cherry picked from commit faa6453ec86ecebeff2e2a28dd01db2ee655a22c)
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 9d10ec7e..bedcec6e 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 9dfbda164e8c..2786c8ea451a 100644
+index a9358c796a81..7e39846f556b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -5656,6 +5656,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
+@@ -5657,6 +5657,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 9dfbda164e8c..2786c8ea451a 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7085,6 +7086,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7086,6 +7087,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},