From: Kevin Darbyshire-Bryant Date: Fri, 24 Jan 2020 14:18:26 +0000 (+0000) Subject: kernel: act_ctinfo: really fix backport this time X-Git-Tag: v21.02.0-rc1~3932 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=commitdiff_plain;h=daa218a28858ec4786fd22cb4f282754e4aab003 kernel: act_ctinfo: really fix backport this time Signed-off-by: Kevin Darbyshire-Bryant --- diff --git a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch index e8e9173d20..96f458f9c9 100644 --- a/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch +++ b/target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch @@ -579,7 +579,7 @@ Signed-off-by: Kevin Darbyshire-Bryant + return tcf_idr_search(tn, a, index); +} + -+static void tcf_ctinfo_cleanup(struct tc_action *a) ++static void tcf_ctinfo_cleanup(struct tc_action *a, int bind) +{ + struct tcf_ctinfo *ci = to_ctinfo(a); + struct tcf_ctinfo_params *cp;