diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-27 15:41:08 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-28 01:04:35 +0200 |
commit | d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c (patch) | |
tree | 0e63ada8a8ad318c076068ae2bb14d530f53604a /target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch | |
parent | 86b44028e2123a199d9ff9cfc1585696bed7af53 (diff) | |
download | upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.tar.gz upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.tar.bz2 upstream-d82e6a2f10b5148c73fe0b04766c5b1f6f9e2d9c.zip |
kernel: Update to version 4.14.199
Compile and runtime tested on lantiq/xrx200 + ath79/generic.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 a42581a4bb..a9b54ced69 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 -@@ -975,8 +975,8 @@ struct nft_af_info { +@@ -977,8 +977,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; } -@@ -5063,15 +5061,12 @@ void nft_flow_table_iterate(struct net * +@@ -5064,15 +5062,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(); -@@ -6563,21 +6558,6 @@ int nft_data_dump(struct sk_buff *skb, i +@@ -6564,21 +6559,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; -@@ -6598,8 +6578,7 @@ int __nft_release_basechain(struct nft_c +@@ -6599,8 +6579,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; -@@ -6609,10 +6588,11 @@ static void __nft_release_afinfo(struct +@@ -6610,10 +6589,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) -@@ -6653,6 +6633,21 @@ static void __nft_release_afinfo(struct +@@ -6654,6 +6634,21 @@ static void __nft_release_afinfo(struct } } |