Merge pull request #662 from vyos/mergify/bp/circinus-stream/pr-660

Kernel: T5887: update Linux Kernel to v6.6.34 (backport #660)
vyos · Jun 19, 2024 · e642c46 · e642c46
2 parents 710351e + ebc4cff
commit e642c46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/defaults.toml b/data/defaults.toml
@@ -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"

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