summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-17 20:07:32 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-06-19 11:15:04 +0000
commit0a8f9158f2bb48a05b2013e3c18e1ad49f61fd27 (patch)
tree0e1ca0444d1411216809bd96f0aa907272812461
parent6158cee7926b34c4b81448842c372051b517fa95 (diff)
downloadvyos-build-0a8f9158f2bb48a05b2013e3c18e1ad49f61fd27.tar.gz
vyos-build-0a8f9158f2bb48a05b2013e3c18e1ad49f61fd27.zip
Kernel: T5887: update Linux Kernel to v6.6.34
(cherry picked from commit 41771586bd7cef98cd8151e9b36e3d045baa7622)
-rw-r--r--data/defaults.toml2
-rw-r--r--packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml
index 7df81ec2..ebd62251 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.33"
+kernel_version = "6.6.34"
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 af67ef5c..a4026a24 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
@@ -126,10 +126,10 @@ index 9dfbda164e8c..2786c8ea451a 100644
.procname = "ioam6_id",
.data = &ipv6_devconf.ioam6_id,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 236a45557ba1..96a8dda0d423 100644
+index c48eaa7c2340..309a93100c34 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)
+@@ -677,6 +677,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
}
#endif
@@ -144,7 +144,7 @@ index 236a45557ba1..96a8dda0d423 100644
/*
* Default Router Selection (RFC 2461 6.3.6)
*/
-@@ -717,6 +725,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
+@@ -718,6 +726,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
if (!m && (strict & RT6_LOOKUP_F_IFACE))
return RT6_NUD_FAIL_HARD;