kernel: bump 4.14 to 4.14.104

[openwrt/staging/wigyori.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 1db472dd6a9ad0c29f7b9bf0921634402743e3be..d1325de2d4b935c74e0e431f1d2b38d49d6b2950 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
@@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/include/net/netfilter/nf_tables.h
 +++ b/include/net/netfilter/nf_tables.h
-@@ -969,8 +969,8 @@ struct nft_af_info {
+@@ -974,8 +974,8 @@ struct nft_af_info {
        struct module                   *owner;
  };
  
@@ -364,7 +364,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                if (afi->family == family)
                        return afi;
        }
-@@ -4975,15 +4973,12 @@ void nft_flow_table_iterate(struct net *
+@@ -5035,15 +5033,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();
-@@ -6468,21 +6463,6 @@ int nft_data_dump(struct sk_buff *skb, i
+@@ -6535,21 +6530,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;
-@@ -6503,8 +6483,7 @@ int __nft_release_basechain(struct nft_c
+@@ -6570,8 +6550,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;
-@@ -6514,10 +6493,11 @@ static void __nft_release_afinfo(struct
+@@ -6581,10 +6560,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)
-@@ -6558,6 +6538,21 @@ static void __nft_release_afinfo(struct
+@@ -6625,6 +6605,21 @@ static void __nft_release_afinfo(struct
        }
  }