summaryrefslogtreecommitdiff
path: root/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch')
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 7bd0b04b..107fdc67 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -6,6 +6,7 @@ Subject: [PATCH] VyOS: Add linkstate IP device attribute
Backport of earlier Vyatta patch.
(cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc)
+
---
Documentation/networking/ip-sysctl.rst | 11 +++++++++++
include/linux/inetdevice.h | 1 +
@@ -100,7 +101,7 @@ index c33b1ecc591e..7576d51cd16d 100644
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 8360939acf85..b13832a08d28 100644
+index bb9add46e382..20346b1dd103 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5674,6 +5674,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
@@ -111,7 +112,7 @@ index 8360939acf85..b13832a08d28 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7103,6 +7104,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7116,6 +7117,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},
@@ -126,10 +127,10 @@ index 8360939acf85..b13832a08d28 100644
.procname = "ioam6_id",
.data = &ipv6_devconf.ioam6_id,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 5715d54f3d0b..e88971b512ba 100644
+index 53197087353a..4fed0253cf83 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
-@@ -682,6 +682,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
+@@ -716,6 +716,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
}
#endif
@@ -144,7 +145,7 @@ index 5715d54f3d0b..e88971b512ba 100644
/*
* Default Router Selection (RFC 2461 6.3.6)
*/
-@@ -723,6 +731,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
+@@ -757,6 +765,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;