diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-09-06 14:18:24 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-09-07 17:22:23 +0200 |
| commit | 55bbd8293c9f6e8f8814e0788df4ee9fb3671a09 (patch) | |
| tree | 6096b320c0b2186448a7dff8de5e78e33e317f88 /target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch | |
| parent | 81d73ae747881387efd060db5c42c98de694024d (diff) | |
| download | upstream-55bbd8293c9f6e8f8814e0788df4ee9fb3671a09.tar.gz upstream-55bbd8293c9f6e8f8814e0788df4ee9fb3671a09.tar.bz2 upstream-55bbd8293c9f6e8f8814e0788df4ee9fb3671a09.zip | |
kernel: bump 4.14 to 4.14.68
Refreshed all patches.
Remove upstream accepted:
- 330-Revert-MIPS-BCM47XX-Enable-74K-Core-ExternalSync-for.patch
Altered:
- 303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
- 308-mips32r2_tune.patch
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.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 0d973ac028..d71c8e0aba 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 -@@ -6523,6 +6523,12 @@ static int __net_init nf_tables_init_net +@@ -6544,6 +6544,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; -@@ -6600,6 +6606,7 @@ static void __nft_release_afinfo(struct +@@ -6621,6 +6627,7 @@ static void __nft_release_afinfo(struct static struct pernet_operations nf_tables_net_ops = { .init = nf_tables_init_net, |