aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-10-14 14:33:42 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-10-15 16:13:06 +0200
commitf3a265575cdbb8b41f66daff13b13d0348277c71 (patch)
tree656a1edcf8bec368b2acda05de34cd7303d7794b /target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
parent00f96dcddb7717a8cd30e75ef38e7ec03adb0f6b (diff)
downloadupstream-f3a265575cdbb8b41f66daff13b13d0348277c71.tar.gz
upstream-f3a265575cdbb8b41f66daff13b13d0348277c71.tar.bz2
upstream-f3a265575cdbb8b41f66daff13b13d0348277c71.zip
kernel: bump 4.14 to 4.14.149
Refreshed all patches. Altered patches: - 820-sec-support-layerscape.patch Compile-tested on: ar71xx, brcm2708, cns3xxx, imx6, layerscape, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch')
-rw-r--r--target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
index 7113c5d9c4..b15a01e062 100644
--- a/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
+++ b/target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
@@ -236,7 +236,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.owner = THIS_MODULE,
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -5099,40 +5099,38 @@ static int nf_tables_newflowtable(struct
+@@ -5102,40 +5102,38 @@ static int nf_tables_newflowtable(struct
}
flowtable->data.type = type;
@@ -285,7 +285,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
err3:
module_put(type->owner);
err2:
-@@ -5413,10 +5411,8 @@ err:
+@@ -5416,10 +5414,8 @@ err:
static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable)
{