diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-02 20:53:33 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-05-02 20:54:10 +0200 |
| commit | aa28145e43e190c20f337487fdf43a13bda88644 (patch) | |
| tree | cfa165e184aa42a38958514bae8085aa06a0657c | |
| parent | 47c58c88388c6cbfb1d9f79f720be882ff644239 (diff) | |
| download | vyos-build-aa28145e43e190c20f337487fdf43a13bda88644.tar.gz vyos-build-aa28145e43e190c20f337487fdf43a13bda88644.zip | |
Kernel: T5887: update Linux Kernel to v6.6.30
(cherry picked from commit 5978fd1df855d163436e4e9108a32bc2d1157af4)
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 8eb72290..c1d27ce5 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta" vyos_branch = "sagitta" release_train = "sagitta" -kernel_version = "6.6.29" +kernel_version = "6.6.30" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" 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 e678a63e..2e9b4dd6 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 6f57cbddeee6..6ea474d2c170 100644 +index d1806eee1687..b4893d713b8c 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -5655,6 +5655,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, +@@ -5656,6 +5656,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 6f57cbddeee6..6ea474d2c170 100644 } static inline size_t inet6_ifla6_size(void) -@@ -7083,6 +7084,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7084,6 +7085,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)SYSCTL_ONE, }, @@ -126,7 +126,7 @@ index 6f57cbddeee6..6ea474d2c170 100644 .procname = "ioam6_id", .data = &ipv6_devconf.ioam6_id, diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 56525b5b95a2..e3af0e704291 100644 +index 236a45557ba1..96a8dda0d423 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -676,6 +676,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) |