EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel: act_ctinfo: fixup build error on 4.14

Browse Source 
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2020-01-24 13:37:58 +00:00
parent 40842167d2
commit 943cc81b0f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch
View File

@ -112,7 +112,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
include/uapi/linux/tc_act/tc_ctinfo.h | 29 ++ include/uapi/linux/tc_act/tc_ctinfo.h | 29 ++
net/sched/Kconfig | 13 + net/sched/Kconfig | 13 +
net/sched/Makefile | 1 + net/sched/Makefile | 1 +
net/sched/act_ctinfo.c | 404 ++++++++++++++++++++++++++ net/sched/act_ctinfo.c | 405 ++++++++++++++++++++++++++
6 files changed, 482 insertions(+), 1 deletion(-) 6 files changed, 482 insertions(+), 1 deletion(-)
create mode 100644 include/net/tc_act/tc_ctinfo.h create mode 100644 include/net/tc_act/tc_ctinfo.h
create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h create mode 100644 include/uapi/linux/tc_act/tc_ctinfo.h
@ -232,7 +232,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o
--- /dev/null --- /dev/null
+++ b/net/sched/act_ctinfo.c +++ b/net/sched/act_ctinfo.c
@@ -0,0 +1,404 @@ @@ -0,0 +1,405 @@
+// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+
+/* net/sched/act_ctinfo.c netfilter ctinfo connmark actions +/* net/sched/act_ctinfo.c netfilter ctinfo connmark actions
+ * + *
@ -579,6 +579,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+ return tcf_idr_search(tn, a, index); + return tcf_idr_search(tn, a, index);
+} +}
+ +
+static void tcf_ctinfo_cleanup(struct tc_action *a)
+{ +{
+ struct tcf_ctinfo *ci = to_ctinfo(a); + struct tcf_ctinfo *ci = to_ctinfo(a);
+ struct tcf_ctinfo_params *cp; + struct tcf_ctinfo_params *cp;