diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-04 13:51:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-04 13:51:26 +0200 |
| commit | 13471dc0b2f142792121671283a57758f126ab93 (patch) | |
| tree | f09574bb9f80985b6c68c75048c980fc19efa5ee /packages/linux-kernel | |
| parent | 6ebfc05dafe6eb5c2b9a01192596212e7653e78e (diff) | |
| parent | 67e4a8c787d236fb0108841962b275e06e137dde (diff) | |
| download | vyos-build-13471dc0b2f142792121671283a57758f126ab93.tar.gz vyos-build-13471dc0b2f142792121671283a57758f126ab93.zip | |
Merge pull request #682 from vyos/mergify/bp/sagitta/pr-681
Kernel: T5887: update Linux Kernel to v6.6.36 (backport #681)
Diffstat (limited to 'packages/linux-kernel')
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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; |