---------- Forwarded message ---------- From: Georgios Amanakis <[email protected]> Date: Mon, Mar 19, 2018 at 12:08 PM Subject: Re: [Cake] Compiling under net-next To: Toke Høiland-Jørgensen <[email protected]>
> Ah, wait, nla_parse_nested() takes an extack parameter now, so we should > pass that through in cake_change() after this change. From 0c3c135cc65fa1fdd2521490c8f1edee41edcea2 Mon Sep 17 00:00:00 2001 From: gamanakis <[email protected]> Date: Sun, 18 Mar 2018 22:20:38 -0400 Subject: [PATCH 1/2] Fixes for 4.16 --- sch_cake.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sch_cake.c b/sch_cake.c index 9f2acb5..f18273b 100644 --- a/sch_cake.c +++ b/sch_cake.c @@ -2364,7 +2364,12 @@ static void cake_reconfigure(struct Qdisc *sch) q->buffer_limit = min(q->buffer_limit, max(sch->limit * psched_mtu(qdisc_dev(sch)), q->buffer_config_limit)); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) static int cake_change(struct Qdisc *sch, struct nlattr *opt) +#else +static int cake_change(struct Qdisc *sch, struct nlattr *opt, + struct netlink_ext_ack *extack) +#endif { struct cake_sched_data *q = qdisc_priv(sch); struct nlattr *tb[TCA_CAKE_MAX + 1]; @@ -2500,7 +2505,12 @@ static void cake_destroy(struct Qdisc *sch) cake_free(q->tins); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) static int cake_init(struct Qdisc *sch, struct nlattr *opt) +#else +static int cake_init(struct Qdisc *sch, struct nlattr *opt, + struct netlink_ext_ack *extack) +#endif { struct cake_sched_data *q = qdisc_priv(sch); int i, j; @@ -2520,7 +2530,11 @@ static int cake_init(struct Qdisc *sch, struct nlattr *opt) q->cur_flow = 0; if (opt) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) int err = cake_change(sch, opt); +#else + int err = cake_change(sch, opt, extack); +#endif if (err) return err; -- 2.16.2 From 6b9e5b18d1cdc8d8a4e4e76dafd6e9b8555eee6f Mon Sep 17 00:00:00 2001 From: gamanakis <[email protected]> Date: Mon, 19 Mar 2018 12:01:24 -0400 Subject: [PATCH 2/2] Fixes for 4.16 (2) --- sch_cake.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sch_cake.c b/sch_cake.c index f18273b..22197e0 100644 --- a/sch_cake.c +++ b/sch_cake.c @@ -2380,8 +2380,10 @@ static int cake_change(struct Qdisc *sch, struct nlattr *opt, #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, NULL); +#else + err = nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, extack); #endif if (err < 0) return err; -- 2.16.2 _______________________________________________ Cake mailing list [email protected] https://lists.bufferbloat.net/listinfo/cake
