summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-07-02 21:46:01 +0200
committerChristian Breunig <christian@breunig.cc>2024-07-02 21:46:01 +0200
commitdd322145bec2902dd4f18064d6c6f18464b987f9 (patch)
tree66c7a9f3d7f5ec3798f2324b2a23e3c59ef13a50
parent9d79c0c6090994640967cb2b4ace822efd611a3a (diff)
downloadvyos-build-dd322145bec2902dd4f18064d6c6f18464b987f9.tar.gz
vyos-build-dd322145bec2902dd4f18064d6c6f18464b987f9.zip
Kernel: T5887: update Linux Kernel to v6.6.36
-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 693e7657..2ff691f2 100644
--- 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.35"
+kernel_version = "6.6.36"
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 a4026a24..9d10ec7e 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 c48eaa7c2340..309a93100c34 100644
+index eb3afaee62e8..0f8670e74cc7 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
-@@ -677,6 +677,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
+@@ -679,6 +679,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
}
#endif
@@ -144,7 +144,7 @@ index c48eaa7c2340..309a93100c34 100644
/*
* Default Router Selection (RFC 2461 6.3.6)
*/
-@@ -718,6 +726,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
+@@ -720,6 +728,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;