aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-10 12:41:32 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-10-10 14:45:11 +0200
commitf983956a8b724028cb9a0b7c9f3195e02e8a5b9e (patch)
tree2de0b76f42c7848ca36c4bb0d2079867baeabfd6 /target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
parent571fe284641ebd7cce6387c3b5e50a8c872bc2e7 (diff)
downloadupstream-f983956a8b724028cb9a0b7c9f3195e02e8a5b9e.tar.gz
upstream-f983956a8b724028cb9a0b7c9f3195e02e8a5b9e.tar.bz2
upstream-f983956a8b724028cb9a0b7c9f3195e02e8a5b9e.zip
kernel: bump 4.14 to 4.14.75
Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch')
-rw-r--r--target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch b/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
index 784368520d..84048a0be8 100644
--- a/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
+++ b/target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
WARN_ON(!nf_flow_offload_gc_step(flow_table));
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -4990,23 +4990,6 @@ static const struct nf_flowtable_type *n
+@@ -4991,23 +4991,6 @@ static const struct nf_flowtable_type *n
return ERR_PTR(-ENOENT);
}