diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-14 14:39:40 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-01-20 13:41:49 +0100 |
commit | b5480de4d1527216cdc3719670a203fb05e72e88 (patch) | |
tree | 7e55c641063cb246c87a7f5fa6036c238323dcf2 /target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | |
parent | 098cbc68ee23db589ed6f0d081fe26cc385462f2 (diff) | |
download | upstream-b5480de4d1527216cdc3719670a203fb05e72e88.tar.gz upstream-b5480de4d1527216cdc3719670a203fb05e72e88.tar.bz2 upstream-b5480de4d1527216cdc3719670a203fb05e72e88.zip |
kernel: bump 4.14 to 4.14.164
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch index 8d0d62b1ec..b00675df20 100644 --- a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch +++ b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch @@ -21,7 +21,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static struct pernet_operations clusterip_net_ops = { --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -6566,6 +6566,12 @@ static int __net_init nf_tables_init_net +@@ -6572,6 +6572,12 @@ static int __net_init nf_tables_init_net return 0; } @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> int __nft_release_basechain(struct nft_ctx *ctx) { struct nft_rule *rule, *nr; -@@ -6643,6 +6649,7 @@ static void __nft_release_afinfo(struct +@@ -6649,6 +6655,7 @@ static void __nft_release_afinfo(struct static struct pernet_operations nf_tables_net_ops = { .init = nf_tables_init_net, |