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-07-10 11:52:53 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-07-11 16:02:24 +0200
commitba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3 (patch)
tree08147ff780b67b82254ce61f88aa34410b142899 /target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
parent954faac7bc1dd34047bc4132cd28a96089fcce4e (diff)
downloadupstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.tar.gz
upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.tar.bz2
upstream-ba2b0f0ac6de840ed5eefdf1e32d28bb2d00fbb3.zip
kernel: bump 4.14 to 4.14.54
Rereshed all patches Reworked patches to match upstream: 335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 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 431098fa09..37975ae038 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
-@@ -6477,6 +6477,12 @@ static int __net_init nf_tables_init_net
+@@ -6522,6 +6522,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;
-@@ -6554,6 +6560,7 @@ static void __nft_release_afinfo(struct
+@@ -6599,6 +6605,7 @@ static void __nft_release_afinfo(struct
static struct pernet_operations nf_tables_net_ops = {
.init = nf_tables_init_net,