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-02-27 17:07:48 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-03-05 13:19:43 +0100
commit1cfbf95393decf047900e1b66b076a030704db20 (patch)
tree8087326ea9c0d8885763999944c258fdd5b742f4 /target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
parentfc45ae44613b41f7328e81d0999f609dd7e81482 (diff)
downloadupstream-1cfbf95393decf047900e1b66b076a030704db20.tar.gz
upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.bz2
upstream-1cfbf95393decf047900e1b66b076a030704db20.zip
kernel: bump 4.14 to 4.14.104
Refreshed all patches. Altered patches: - 332-arc-add-OWRTDTB-section.patch Compile-tested on: ar71xx, cns3xxx, imx6, 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 3cc644a530..601df0cf95 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
-@@ -5075,40 +5075,38 @@ static int nf_tables_newflowtable(struct
+@@ -5080,40 +5080,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:
-@@ -5389,10 +5387,8 @@ err:
+@@ -5394,10 +5392,8 @@ err:
static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable)
{