kernel: bump 4.19 to 4.19.62

[openwrt/staging/lynxis.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 23156b521c55da37c8b2eb22d0c5346ed30808ef..f63e081b6824243a390637f5ed43b8df073e898d 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
@@ -25,9 +25,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -      rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache;
 +      rt = (struct rtable *)flow->tuplehash[!dir].tuple.dst_cache;
  
-       if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)) &&
-           (ip_hdr(skb)->frag_off & htons(IP_DF)) != 0)
-@@ -465,7 +465,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
+       if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)))
+               return NF_ACCEPT;
+@@ -464,7 +464,7 @@ nf_flow_offload_ipv6_hook(void *priv, st
  
        dir = tuplehash->tuple.dir;
        flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]);
@@ -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
-@@ -18,13 +18,11 @@ struct nft_flow_offload {
+@@ -17,13 +17,11 @@ struct nft_flow_offload {
        struct nft_flowtable    *flowtable;
  };
  
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        struct flowi fl;
  
        memset(&fl, 0, sizeof(fl));
-@@ -39,8 +37,21 @@ static int nft_flow_route(const struct n
+@@ -38,8 +36,21 @@ static int nft_flow_route(const struct n
                break;
        }