projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.164
[openwrt/staging/dedeckeh.git]
/
target
/
linux
/
generic
/
backport-4.14
/
359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
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 e39daf89272973aefd516c8e0df9219f6cd98259..643189b5c039f2768f521425fe6b66d213c43fdb 100644
(file)
--- 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
WARN_ON(!nf_flow_offload_gc_step(flow_table));
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -501
2,23 +5012
,6 @@ static const struct nf_flowtable_type *n
+@@ -501
8,23 +5018
,6 @@ static const struct nf_flowtable_type *n
return ERR_PTR(-ENOENT);
}
return ERR_PTR(-ENOENT);
}