kernel: bump 4.19 to 4.19.34

[openwrt/staging/dangole.git] / target / linux / generic / backport-4.19 / 366-netfilter-nf_flow_table-clean-up-and-fix-dst-handlin.patch

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 624602dabe549a43035ac00915f2b940c2ff0339..ac7a73b60e75b3d5879a08a81fbc41cb701c61c7 100644 (file)
--- 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;
        }