kernel: make make patches/files apply/compile for kernel 5.2

[openwrt/staging/mkresin.git] / target / linux / generic / hack-5.2 / 649-Revert-netfilter-nf_flow_table-make-nf_flow_table_it.patch

diff --git a/target/linux/generic/hack-5.2/649-Revert-netfilter-nf_flow_table-make-nf_flow_table_it.patch b/target/linux/generic/hack-5.2/649-Revert-netfilter-nf_flow_table-make-nf_flow_table_it.patch
index a0abe6050511e53e1f3d7e7c71ddd9e059f56df6..d891bb37197d1223884d7d11ba046f5919abf63c 100644 (file)
--- a/target/linux/generic/hack-5.2/649-Revert-netfilter-nf_flow_table-make-nf_flow_table_it.patch
+++ b/target/linux/generic/hack-5.2/649-Revert-netfilter-nf_flow_table-make-nf_flow_table_it.patch
@@ -25,7 +25,7 @@ This reverts commit 49de9c090f3cc747cb7f2dc79c175d7bd1d3f1e7.
  int nf_flow_table_init(struct nf_flowtable *flow_table);
 --- a/net/netfilter/nf_flow_table_core.c
 +++ b/net/netfilter/nf_flow_table_core.c
-@@ -307,10 +307,9 @@ flow_offload_lookup(struct nf_flowtable
+@@ -313,10 +313,9 @@ flow_offload_lookup(struct nf_flowtable
  }
  EXPORT_SYMBOL_GPL(flow_offload_lookup);
  
@@ -39,7 +39,7 @@ This reverts commit 49de9c090f3cc747cb7f2dc79c175d7bd1d3f1e7.
  {
        struct flow_offload_tuple_rhash *tuplehash;
        struct rhashtable_iter hti;
-@@ -340,6 +339,7 @@ nf_flow_table_iterate(struct nf_flowtabl
+@@ -346,6 +345,7 @@ nf_flow_table_iterate(struct nf_flowtabl
  
        return err;
  }