diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 14:15:26 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-08 14:53:39 +0200 |
commit | 8df12d76c642cd2e094e2c02fdf7b676fb902bc7 (patch) | |
tree | 9ed8d8949c7a12c11849831301d20f847da83d46 /target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch | |
parent | 5387bc9cbb9ed205f08766523a296f21dfa83b56 (diff) | |
download | upstream-8df12d76c642cd2e094e2c02fdf7b676fb902bc7.tar.gz upstream-8df12d76c642cd2e094e2c02fdf7b676fb902bc7.tar.bz2 upstream-8df12d76c642cd2e094e2c02fdf7b676fb902bc7.zip |
kernel: bump 4.19 to 4.19.34
Refreshed all patches.
Removed:
- 030-PCI-dwc-skip-MSI-init-if-MSIs-have-been-explicitly-d.patch
Altered:
- 366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch
- 650-netfilter-add-xt_OFFLOAD-target.patch
- 662-remove_pfifo_fast.patch
- 332-arc-add-OWRTDTB-section.patch
- 100-clocksource-drivers-arch_timer-Workaround-for-Allwin.patch
- 702-phy_add_aneg_done_function.patch
New symbols:
- ARC_IRQ_NO_AUTOSAVE
- SUN50I_ERRATUM_UNKNOWN1
Compile-tested: cns3xxx, imx6, sunxi
Runtime-tested: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch')
-rw-r--r-- | target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch b/target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch index 624602dabe..ac7a73b60e 100644 --- a/target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch +++ b/target/linux/generic/backport-4.19/366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return NF_ACCEPT; --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c -@@ -17,27 +17,38 @@ struct nft_flow_offload { +@@ -18,13 +18,11 @@ struct nft_flow_offload { struct nft_flowtable *flowtable; }; @@ -56,14 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct flowi fl; memset(&fl, 0, sizeof(fl)); - switch (nft_pf(pkt)) { - case NFPROTO_IPV4: -- fl.u.ip4.daddr = ct->tuplehash[!dir].tuple.dst.u3.ip; -+ fl.u.ip4.daddr = ct->tuplehash[dir].tuple.src.u3.ip; - break; - case NFPROTO_IPV6: -- fl.u.ip6.daddr = ct->tuplehash[!dir].tuple.dst.u3.in6; -+ fl.u.ip6.daddr = ct->tuplehash[dir].tuple.src.u3.in6; +@@ -39,8 +37,21 @@ static int nft_flow_route(const struct n break; } |