diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-10 11:52:53 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-07-11 16:02:24 +0200 |
commit | ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3 (patch) | |
tree | 08147ff780b67b82254ce61f88aa34410b142899 /target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch | |
parent | 954faac7bc1dd34047bc4132cd28a96089fcce4e (diff) | |
download | upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.tar.gz upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.tar.bz2 upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.zip |
kernel: bump 4.14 to 4.14.54
Rereshed all patches
Reworked patches to match upstream:
335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
Compile-tested on: cns3xxx, imx6, x86_64
Runtime-tested on: cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 1db472dd6a..2683f5b031 100644 --- 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 * +@@ -5018,15 +5016,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 +@@ -6513,21 +6508,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 +@@ -6548,8 +6528,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 +@@ -6559,10 +6538,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 +@@ -6603,6 +6583,21 @@ static void __nft_release_afinfo(struct } } |