diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-10 12:37:20 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-10 14:46:25 +0200 |
commit | bba743458eb48f9b2ae73c3d173920062c9b3f00 (patch) | |
tree | 46442ab0cca4f7f1433673a281985fe53057f6d6 /target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch | |
parent | 86a3d2604f2439d8cd94347ac3e4672b04c6d74a (diff) | |
download | upstream-bba743458eb48f9b2ae73c3d173920062c9b3f00.tar.gz upstream-bba743458eb48f9b2ae73c3d173920062c9b3f00.tar.bz2 upstream-bba743458eb48f9b2ae73c3d173920062c9b3f00.zip |
kernel: bump 4.14 to 4.14.75
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/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.patch | 4 |
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 601df0cf95..2cf8cea23c 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 -@@ -5080,40 +5080,38 @@ static int nf_tables_newflowtable(struct +@@ -5081,40 +5081,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: -@@ -5394,10 +5392,8 @@ err: +@@ -5395,10 +5393,8 @@ err: static void nf_tables_flowtable_destroy(struct nft_flowtable *flowtable) { |