aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-17 13:31:05 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-18 11:38:58 +0200
commitcf6526249298bef88526b676531d2c66b96f7154 (patch)
tree9101c353e5b7610ace84b0fad34b97afa9a2381a /target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch
parentde5105febe49e16f8d1aafc35bd10121020503b4 (diff)
downloadupstream-cf6526249298bef88526b676531d2c66b96f7154.tar.gz
upstream-cf6526249298bef88526b676531d2c66b96f7154.tar.bz2
upstream-cf6526249298bef88526b676531d2c66b96f7154.zip
kernel: bump 4.19 to 4.19.51
Refreshed all patches. Altered patches: - 370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch - 220-optimize_inlining.patch - 640-netfilter-nf_flow_table-add-hardware-offload-support.patch This patch also restores the initial implementation of the ath79 perfcount IRQ issue. (78ee6b1a40b5) It was wrongfully backported upstream initially and got reverted now. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch')
-rw-r--r--target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch b/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch
index 2a9725f939..aa842015fc 100644
--- a/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch
+++ b/target/linux/generic/hack-4.19/647-netfilter-flow-acct.patch
@@ -52,7 +52,7 @@
/* For layer 4 checksum field offset. */
#include <linux/tcp.h>
#include <linux/udp.h>
-@@ -265,6 +266,7 @@ nf_flow_offload_ip_hook(void *priv, stru
+@@ -268,6 +269,7 @@ nf_flow_offload_ip_hook(void *priv, stru
skb->dev = outdev;
nexthop = rt_nexthop(rt, flow->tuplehash[!dir].tuple.src_v4.s_addr);
skb_dst_set_noref(skb, &rt->dst);
@@ -60,7 +60,7 @@
neigh_xmit(NEIGH_ARP_TABLE, outdev, &nexthop, skb);
return NF_STOLEN;
-@@ -482,6 +484,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
+@@ -488,6 +490,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
skb->dev = outdev;
nexthop = rt6_nexthop(rt, &flow->tuplehash[!dir].tuple.src_v6);
skb_dst_set_noref(skb, &rt->dst);