diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-04-07 10:08:16 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-04-09 00:12:46 +0200 |
| commit | b299002877c801202c3b61d5e09865e88f506176 (patch) | |
| tree | cf1d30e16b53a53e4d04630527f67b01eac38181 /target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch | |
| parent | 196cab719f8f318ec771e5f1a07728c12b7fa207 (diff) | |
| download | upstream-b299002877c801202c3b61d5e09865e88f506176.tar.gz upstream-b299002877c801202c3b61d5e09865e88f506176.tar.bz2 upstream-b299002877c801202c3b61d5e09865e88f506176.zip | |
kernel: bump 5.4 to 5.4.31
Refreshed patches, removed upstreamed patches:
oxnas: 003-ARM-dts-oxnas-Fix-clear-mask-property.patch
generic: 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch
Run tested: apu2, qemu-x86-64, apalis
Build tested: sunxi/a53, imx6, x86/64, ipq40xx
Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch')
| -rw-r--r-- | target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch b/target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch index 920514f11f..a7761e2d46 100644 --- a/target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch +++ b/target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch @@ -52,7 +52,7 @@ /* For layer 4 checksum field offset. */ #include <linux/tcp.h> #include <linux/udp.h> -@@ -295,6 +296,7 @@ nf_flow_offload_ip_hook(void *priv, stru +@@ -296,6 +297,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; -@@ -524,6 +526,7 @@ nf_flow_offload_ipv6_hook(void *priv, st +@@ -526,6 +528,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); |