diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-14 14:42:28 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-20 13:43:56 +0100 |
| commit | 9298c443df2fd540fa929c879fb71867ee518e5a (patch) | |
| tree | 612a4fc965e346c9dce7d206af7c0614045ed6c6 /target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch | |
| parent | d46b00cf0f9951267ab5af3b2db5cb4d4e14621e (diff) | |
| download | upstream-9298c443df2fd540fa929c879fb71867ee518e5a.tar.gz upstream-9298c443df2fd540fa929c879fb71867ee518e5a.tar.bz2 upstream-9298c443df2fd540fa929c879fb71867ee518e5a.zip | |
kernel: bump 4.14 to 4.14.164
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6
Runtime-tested on: ar71xx, cns3xxx, imx6
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 | 10 |
1 files changed, 5 insertions, 5 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 da9d4ffd03..a42581a4bb 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 @@ -364,7 +364,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> if (afi->family == family) return afi; } -@@ -5057,15 +5055,12 @@ void nft_flow_table_iterate(struct net * +@@ -5063,15 +5061,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(); -@@ -6557,21 +6552,6 @@ int nft_data_dump(struct sk_buff *skb, i +@@ -6563,21 +6558,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; -@@ -6592,8 +6572,7 @@ int __nft_release_basechain(struct nft_c +@@ -6598,8 +6578,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; -@@ -6603,10 +6582,11 @@ static void __nft_release_afinfo(struct +@@ -6609,10 +6588,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) -@@ -6647,6 +6627,21 @@ static void __nft_release_afinfo(struct +@@ -6653,6 +6633,21 @@ static void __nft_release_afinfo(struct } } |