From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-x22d.google.com (mail-lf0-x22d.google.com [IPv6:2a00:1450:4010:c07::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 0079E3CB60 for ; Mon, 19 Mar 2018 12:09:42 -0400 (EDT) Received: by mail-lf0-x22d.google.com with SMTP id y2-v6so24161946lfc.5 for ; Mon, 19 Mar 2018 09:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-transfer-encoding; bh=Di0MRU7ZJ0nGFGuYrrPkETWIDQuL6g2tAOO/NwU92Ow=; b=vaUxvtsyq4+Tvo/sNos74eApKR/5S9Dv1vKqZLmvrsigpxIH4ZUgZ2xWG20J4y3D02 0S1Q/8+Vi7unNupN7OJAhPJV/cwnAhbv49DEJVQUBXAeOJB4g9zkMLoLAKOEuaJjF1kz R4W8KAb4PH1AH6lDkg6jY5v09EUGechgfPqKIWkTJspL+UdeE5OOVNDZ10zxorQWWbdC DY9zAemJ7aGHeKlvu+qS/QTLZiqQMRark2kygvLCD0BQQcnnvrPaxEtM7aSWIasBp/Fn MHOmn7y9mHkS3Ehr0DvAUtbeQ6rkb5BI3m2yknKCt/SXHT/OluEL4DNn3SB4jKvyIfiO B2uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:content-transfer-encoding; bh=Di0MRU7ZJ0nGFGuYrrPkETWIDQuL6g2tAOO/NwU92Ow=; b=JAcJgPAu6dw01w23aJmkuWSNgl0g6rRgCkGcB6qqYJPuDwqhFeaqhwg/LNBk28EndC VxXgi0XtxZEp+6r/VJt4BEXsISeLIgxWH80icrzV42YQ+ed7GV3DypnqnJdxk/ibcGUD 8L/AAQ2QRo3t/GkzCaI9ksK1a0AogJT/yDF8UrWS254tDDuQtHor6xAO53uhsqwgcj+j PshU+yqhg0KKoSXiiFKHGIJ7Q53H/1wZSnruPoTPOIOExmV8lY470XHIgEOk4hOl7L8h PYdnVuhugl/A1Q81mOwRR5yLId/bCGXa2Hg5vXNdZpuDHi07sd87ZT5608zWit/WgHaL DWuQ== X-Gm-Message-State: AElRT7EXjcfBnUIBBwo7eiFBVutv2VoBG5OOREtC7GwkuDtMOKFlWMFC jWTjTkIffiu3zEhHE0MBYnMVx/1VFqiF+zpnlvA= X-Google-Smtp-Source: AG47ELvvVvvGhibVcQUeR0RK50MkUrk5GS9niqxz3eQjPUrKmlx0/E0vhFb6/c2p9o8mQfCqeDV96vOuMFkW2fAfpqc= X-Received: by 2002:a19:ca41:: with SMTP id h1-v6mr8794649lfj.81.1521475781541; Mon, 19 Mar 2018 09:09:41 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.152.10 with HTTP; Mon, 19 Mar 2018 09:09:41 -0700 (PDT) In-Reply-To: References: <1521403235.24047.7.camel@gmail.com> <1521426571.28105.2.camel@gmail.com> <87vadsbcag.fsf@toke.dk> <87sh8wbb6s.fsf@toke.dk> From: Georgios Amanakis Date: Mon, 19 Mar 2018 12:09:41 -0400 Message-ID: To: Cake List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: [Cake] Fwd: Compiling under net-next X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2018 16:09:43 -0000 ---------- Forwarded message ---------- From: Georgios Amanakis Date: Mon, Mar 19, 2018 at 12:08 PM Subject: Re: [Cake] Compiling under net-next To: Toke H=C3=B8iland-J=C3=B8rgensen > 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 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 =3D 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 =3D 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 =3D qdisc_priv(sch); int i, j; @@ -2520,7 +2530,11 @@ static int cake_init(struct Qdisc *sch, struct nlattr *opt) q->cur_flow =3D 0; if (opt) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) int err =3D cake_change(sch, opt); +#else + int err =3D cake_change(sch, opt, extack); +#endif if (err) return err; -- 2.16.2 >From 6b9e5b18d1cdc8d8a4e4e76dafd6e9b8555eee6f Mon Sep 17 00:00:00 2001 From: gamanakis 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 =3D nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) err =3D nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, NULL); +#else + err =3D nla_parse_nested(tb, TCA_CAKE_MAX, opt, cake_policy, extack); #endif if (err < 0) return err; -- 2.16.2