aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-01-25 23:17:22 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-01-25 23:18:42 +0100
commit2ecb22dc51a501ae619d183283bc7766f5c4fe76 (patch)
treee336e600eca0ea6859b455b36de0067a280c2294 /target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
parent11f4918ebb32f658e419225ef218f82d66b482cc (diff)
downloadupstream-2ecb22dc51a501ae619d183283bc7766f5c4fe76.tar.gz
upstream-2ecb22dc51a501ae619d183283bc7766f5c4fe76.tar.bz2
upstream-2ecb22dc51a501ae619d183283bc7766f5c4fe76.zip
kernel: bump 4.14 to 4.14.217
Refreshed all patches. Compile-tested on: ipq40xx, lantiq/xrx200, x86/64, ipq806x Runtime-tested on: ipq40xx, lantiq/xrx200, x86/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch')
-rw-r--r--target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
index 8e776383d1..7dc1dd7f46 100644
--- a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
+++ b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
@@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
-@@ -381,7 +381,7 @@ static inline int ip6_forward_finish(str
+@@ -419,7 +419,7 @@ static inline int ip6_forward_finish(str
return dst_output(net, sk, skb);
}
@@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
{
unsigned int mtu;
struct inet6_dev *idev;
-@@ -401,6 +401,7 @@ static unsigned int ip6_dst_mtu_forward(
+@@ -439,6 +439,7 @@ static unsigned int ip6_dst_mtu_forward(
return mtu;
}