kernel: bump to 4.14.284

[librecmc/librecmc.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 a9b54ced69d3714f81112fd6b62a182c9ddba0c1..01c2edfec13956b44ef5b9e59b044f4bd200a83f 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;
        }
-@@ -5064,15 +5062,12 @@ void nft_flow_table_iterate(struct net *
+@@ -5068,15 +5066,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();
-@@ -6564,21 +6559,6 @@ int nft_data_dump(struct sk_buff *skb, i
+@@ -6568,21 +6563,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;
-@@ -6599,8 +6579,7 @@ int __nft_release_basechain(struct nft_c
+@@ -6603,8 +6583,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;
-@@ -6610,10 +6589,11 @@ static void __nft_release_afinfo(struct
+@@ -6614,10 +6593,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)
-@@ -6654,6 +6634,21 @@ static void __nft_release_afinfo(struct
+@@ -6658,6 +6638,21 @@ static void __nft_release_afinfo(struct
        }
  }