diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-07-12 07:54:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-12 07:54:43 +0200 |
| commit | defe8e5b7d21289d20f097145ce6519241a27dad (patch) | |
| tree | 469f41f8f3c2dfcae2830df8183558c62f1f3dd4 /scripts/package-build/linux-kernel | |
| parent | c9b8053f272986dddafead7cb9aacb515f8e39d3 (diff) | |
| parent | 9012ce99a92d8706f697f97509b0f4089793afd3 (diff) | |
| download | vyos-build-defe8e5b7d21289d20f097145ce6519241a27dad.tar.gz vyos-build-defe8e5b7d21289d20f097145ce6519241a27dad.zip | |
Merge pull request #988 from c-po/kernel-6.6.96
Kernel: T5887: update Linux Kernel to v6.6.96
Diffstat (limited to 'scripts/package-build/linux-kernel')
| -rw-r--r-- | scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch index 107fdc67..bed612cd 100644 --- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch +++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch @@ -101,10 +101,10 @@ index c33b1ecc591e..7576d51cd16d 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index bb9add46e382..20346b1dd103 100644 +index 231fa4dc6cde..8d8a8ee9c4fe 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -5674,6 +5674,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, +@@ -5677,6 +5677,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; @@ -112,7 +112,7 @@ index bb9add46e382..20346b1dd103 100644 } static inline size_t inet6_ifla6_size(void) -@@ -7116,6 +7117,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7119,6 +7120,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)SYSCTL_ONE, }, |