summaryrefslogtreecommitdiff
path: root/scripts/package-build/linux-kernel/patches/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/package-build/linux-kernel/patches/kernel')
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch10
1 files changed, 5 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 563a8cec..2e838a62 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
@@ -49,7 +49,7 @@ index 7a637e87005f..982c76d0b0ab 100644
- 1 - Allows you to have multiple network interfaces on the same
subnet, and have the ARPs for each interface be answered
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
-index dccbeb25f701..b16f70e491d6 100644
+index 6032eea2539a..b3ecf2a418af 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -139,6 +139,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
@@ -109,10 +109,10 @@ index 942a887bf089..e6df2bfc4e40 100644
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index b2e1328371d3..769d4e1f5cbf 100644
+index c98b1b919f18..e7eb01ce30d1 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -5718,6 +5718,7 @@ static void ipv6_store_devconf(const struct ipv6_devconf *cnf,
+@@ -5731,6 +5731,7 @@ static void ipv6_store_devconf(const struct ipv6_devconf *cnf,
READ_ONCE(cnf->accept_untracked_na);
array[DEVCONF_ACCEPT_RA_MIN_LFT] = READ_ONCE(cnf->accept_ra_min_lft);
array[DEVCONF_FORCE_FORWARDING] = READ_ONCE(cnf->force_forwarding);
@@ -120,7 +120,7 @@ index b2e1328371d3..769d4e1f5cbf 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7253,6 +7254,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7274,6 +7275,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},
@@ -135,7 +135,7 @@ index b2e1328371d3..769d4e1f5cbf 100644
.procname = "ioam6_id",
.data = &ipv6_devconf.ioam6_id,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index f89220929c4e..8f92ef14d884 100644
+index ef66a3c86feb..4a1de714e3a9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -717,6 +717,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)