diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-06-22 21:00:08 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-06-22 21:00:08 +0200 |
| commit | ef28212ca98cbf9ccf00c317f6e34959375c4698 (patch) | |
| tree | e981e5b18fcaab783515c6c4a17b9f0b9febce3a /packages/linux-kernel | |
| parent | 0d0ccd064e145166786e29df07857f2a4f52df0e (diff) | |
| parent | f7d323f2ba4cd773b3badeddc723ca657195b6cb (diff) | |
| download | vyos-build-ef28212ca98cbf9ccf00c317f6e34959375c4698.tar.gz vyos-build-ef28212ca98cbf9ccf00c317f6e34959375c4698.zip | |
Merge branch 'vyos:sagitta' into sagitta
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 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; |