kernel: bump 4.14 to 4.14.89

[openwrt/openwrt.git] / target / linux / generic / backport-4.14 / 337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch

diff --git a/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch b/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch
index de5c2409b3ccf688e1a3f5a50c614b6e7f1d58c9..2274c1327d998762e0f9bbd738ac2da6eb7c8b29 100644 (file)
--- a/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch
+++ b/target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch
@@ -364,7 +364,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                if (afi->family == family)
                        return afi;
        }
-@@ -5036,15 +5034,12 @@ void nft_flow_table_iterate(struct net *
+@@ -5030,15 +5028,12 @@ void nft_flow_table_iterate(struct net *
                            void *data)
  {
        struct nft_flowtable *flowtable;
@@ -383,7 +383,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                }
        }
        rcu_read_unlock();
-@@ -6536,21 +6531,6 @@ int nft_data_dump(struct sk_buff *skb, i
+@@ -6530,21 +6525,6 @@ int nft_data_dump(struct sk_buff *skb, i
  }
  EXPORT_SYMBOL_GPL(nft_data_dump);
  
@@ -405,7 +405,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  int __nft_release_basechain(struct nft_ctx *ctx)
  {
        struct nft_rule *rule, *nr;
-@@ -6571,8 +6551,7 @@ int __nft_release_basechain(struct nft_c
+@@ -6565,8 +6545,7 @@ int __nft_release_basechain(struct nft_c
  }
  EXPORT_SYMBOL_GPL(__nft_release_basechain);
  
@@ -415,7 +415,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  {
        struct nft_flowtable *flowtable, *nf;
        struct nft_table *table, *nt;
-@@ -6582,10 +6561,11 @@ static void __nft_release_afinfo(struct
+@@ -6576,10 +6555,11 @@ static void __nft_release_afinfo(struct
        struct nft_set *set, *ns;
        struct nft_ctx ctx = {
                .net    = net,
@@ -428,7 +428,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                list_for_each_entry(chain, &table->chains, list)
                        nf_tables_unregister_hook(net, table, chain);
                list_for_each_entry(flowtable, &table->flowtables, list)
-@@ -6626,6 +6606,21 @@ static void __nft_release_afinfo(struct
+@@ -6620,6 +6600,21 @@ static void __nft_release_afinfo(struct
        }
  }