From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.toke.dk (mail.toke.dk [52.28.52.200]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 1B2B43CB42 for ; Tue, 20 Mar 2018 05:33:52 -0400 (EDT) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=toke.dk; s=20161023; t=1521538430; bh=gSNc8GjEoZFJLZwzJiwVpeV+3QGhy61dnm7OBY0EMLs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=JM8pkOCGC2tTu9VNxa3cUXE1oZPgNFOGovzYpeL99jwNhntdByj7H7irdH4hfEy3u rVskOYjfQyi7rbB60jETy+piW+cKCBpEpNw5RMK1LRD3i1pGTgdFuZ2TxRpbP/9ndh cReGjxtvJzQMB00RJweG56voPhO36DopkNWU79XJZtUKYZUoc+8OGbkonVmrHrU8O6 08yiPBQRC6wUhZ/3qvsQLEeLmpihpDKWbHn1ST6fphvOH/7w1ijGGjImgARji9Aaby dV70NtDMTjRXJ0VPNgbHRi60zNc/yvxPgZ4gMsIe2rUSpmyATGz8DFSKltsz5Mmd2/ VUArZ8Yqmh9ng== To: George Amanakis , cake@lists.bufferbloat.net In-Reply-To: <20180319171152.27419-1-gamanakis@gmail.com> References: <87k1u89ff2.fsf@toke.dk> <20180319171152.27419-1-gamanakis@gmail.com> Date: Tue, 20 Mar 2018 10:33:48 +0100 X-Clacks-Overhead: GNU Terry Pratchett Message-ID: <87d0zz9jlv.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Cake] [PATCH] Fixes for 4.16 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: Tue, 20 Mar 2018 09:33:52 -0000 Pushed to git; thanks! :) -Toke George Amanakis writes: > From: gamanakis > > Signed-off-by: George Amanakis > --- > sch_cake.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/sch_cake.c b/sch_cake.c > index 9f2acb5..22197e0 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]; > @@ -2375,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; > @@ -2500,7 +2507,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 +2532,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