Merge pull request #660 from c-po/T5887-kernel-6.6.34

Kernel: T5887: update Linux Kernel to v6.6.34
This commit is contained in:
Christian Breunig 2024-06-19 13:14:19 +02:00 committed by GitHub
commit 65333b4644
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View File

@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current"
vyos_branch = "current"
release_train = "current"
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"

View File

@ -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;