From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-x243.google.com (mail-qt0-x243.google.com [IPv6:2607:f8b0:400d:c0d::243]) (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 6FDA53CB3C for ; Mon, 19 Mar 2018 13:12:20 -0400 (EDT) Received: by mail-qt0-x243.google.com with SMTP id v11so10823044qtj.6 for ; Mon, 19 Mar 2018 10:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2gtZ6XICv1Ntv8FVHxVH3n8dEHSE2uC3rH7IBbFYuYk=; b=ti9yFGQ6idk1tDYbjeXIU7Ce80Ls1fk5Kp/fhRwIUc7055aK8rKMZg4lJVSdr9a3u5 KJ69X424OMifJ+rN4TbRVt3zM78xSc7Rc2/6+SP3bMctR1shzheAh5i4S2AVIcLnMFJC rDoIwHQUH+zH3BuMZ+adM9h5SfqZBw2qn+cWhHwu1aZUWwKx0rf1nZXBI2CflR0EnbOH k3aJ3gQL+4lxbeXh2Sg+H0F+Z7Bs1RvvrwNnFD4U/yxhooRzP6+8TCLIKYf6y4HJqxEn oqE/iaFnDyprmmpFqEq52hVMbfXc29IkHZ8WuEdmYKRiBXDfe+qX+25qHdxWpEXaytE+ 21Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2gtZ6XICv1Ntv8FVHxVH3n8dEHSE2uC3rH7IBbFYuYk=; b=sNDLI2Y29ee7tXIs0t8FaNo6zg9FGvLDN2EEdFa8qvzYQ6NLXmWO2KXdj+zfobfFJm z90H+gRAn7/JtYVVW87FrX6/Ur1/NouHB1GTNHBuJVG1g6K1alNPJQ1n1cP5I9xhDBWC bt79EeUEvQ7ZW6TkgNJfKc8M0fvxZta+oMOwIlk3wHhvdLfoTYB8+8Wzo4NAnYa4TjyQ jXMIs7NXNJkPwXzLyTFJnrqxQ4XiI+BrxN1YZ0aNhtOLF1PBekzaueU87sGV3HAhRBNV SenjGIXfJPF8lmVZFFb0tLhFfhlS9fXWnjoKY7y1OSdcwOmbM2uxYbpWwoj3v+jpfA4O aApA== X-Gm-Message-State: AElRT7FeSjGpv5UHzW5BWmZvY1WVxlXGWoM2NqTUP7ag8dmjMuZV3Zju FINlgjhcjZbig007daT4kCeA0w== X-Google-Smtp-Source: AG47ELt7fOoBtCguQlS+5cparyehbSNNpgMXpyNQ4y87rlOms00P0NI6NIfb5MA7rREuqsOauLO58g== X-Received: by 10.237.48.103 with SMTP id 94mr19217488qte.48.1521479539626; Mon, 19 Mar 2018 10:12:19 -0700 (PDT) Received: from x3200.lan ([2601:152:4303:1315:ea1a:64e5:db6:868d]) by smtp.gmail.com with ESMTPSA id c52sm323616qtc.89.2018.03.19.10.12.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 10:12:18 -0700 (PDT) From: George Amanakis To: cake@lists.bufferbloat.net, toke@toke.dk Date: Mon, 19 Mar 2018 13:11:52 -0400 Message-Id: <20180319171152.27419-1-gamanakis@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <87k1u89ff2.fsf@toke.dk> References: <87k1u89ff2.fsf@toke.dk> Subject: [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: Mon, 19 Mar 2018 17:12:20 -0000 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