aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-10 12:37:20 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-10 14:46:25 +0200
commitbba743458eb48f9b2ae73c3d173920062c9b3f00 (patch)
tree46442ab0cca4f7f1433673a281985fe53057f6d6 /target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
parent86a3d2604f2439d8cd94347ac3e4672b04c6d74a (diff)
downloadupstream-bba743458eb48f9b2ae73c3d173920062c9b3f00.tar.gz
upstream-bba743458eb48f9b2ae73c3d173920062c9b3f00.tar.bz2
upstream-bba743458eb48f9b2ae73c3d173920062c9b3f00.zip
kernel: bump 4.14 to 4.14.75
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 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.patch4
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 d71c8e0aba..b1b876cf1d 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
-@@ -6544,6 +6544,12 @@ static int __net_init nf_tables_init_net
+@@ -6545,6 +6545,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;
-@@ -6621,6 +6627,7 @@ static void __nft_release_afinfo(struct
+@@ -6622,6 +6628,7 @@ static void __nft_release_afinfo(struct
static struct pernet_operations nf_tables_net_ops = {
.init = nf_tables_init_net,