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-12-18 14:12:50 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 15:12:06 +0100
commit7b0e1d28e89e8932aa228ff2f37c274745eaa5e8 (patch)
treedfaded69f238608d359af5737be5bb5a817d0ff1 /target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
parent386a57dc596c95919024e0726582a996d801d9fb (diff)
downloadupstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.gz
upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.bz2
upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.zip
kernel: bump 4.14 to 4.14.89
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 5938a9ba5a..e20ddc2917 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
-@@ -6545,6 +6545,12 @@ static int __net_init nf_tables_init_net
+@@ -6539,6 +6539,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;
-@@ -6622,6 +6628,7 @@ static void __nft_release_afinfo(struct
+@@ -6616,6 +6622,7 @@ static void __nft_release_afinfo(struct
static struct pernet_operations nf_tables_net_ops = {
.init = nf_tables_init_net,