From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk0-x22f.google.com (mail-qk0-x22f.google.com [IPv6:2607:f8b0:400d:c09::22f]) (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 EFB323CB3F for ; Sun, 18 Mar 2018 22:29:34 -0400 (EDT) Received: by mail-qk0-x22f.google.com with SMTP id h187so3631535qkf.0 for ; Sun, 18 Mar 2018 19:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:date:in-reply-to:references:mime-version :content-transfer-encoding; bh=M1fDJ24FjluyE8v8UFXm8u2GAngPHLmLMLo04f1hUys=; b=gerxFBHTRFpIlpwXE5z1iMMO+4cwTQ/apg8yaDSvua2Aey/WWhRtLksIshwCW1p1bW dYf7NEoz0JddU6KnN1bCvWR7+0G02KNq9upu8sZioQ6FISoYql8g8xx6GtWJa0g/6sFM 2IA9GOnU4sKCLOC+7qn7/96ulSjRF28j9ZHx+zjM1S2yUGume5SZ3z0XLZIbNAhZ63ir Qm9oKmLU3km93yZT0qUoDyvjaw8cPuDKkWNG+k9Gd7vDcr4ecD5reQSyNys7F2SUK9iR 2Koa+v7c7EaMHC3z0zw3H9LaaW0H6KM2a5uyID71yVRVYgabktud96B4FksCcJX1EslQ iG1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:mime-version:content-transfer-encoding; bh=M1fDJ24FjluyE8v8UFXm8u2GAngPHLmLMLo04f1hUys=; b=C/U5vYseFoamD3GApHpJjF/qDi4nTtJjZd2snJ9/JAZVTEiZOTy05SWDrLfqAMvLZi hJu7gbUHDy5wqvP1MMtJakmaAPoAzUCPvcKFmPZaGDdlmagnPCohWXo/zIMVLWvQTT+J iZ7iD8odw7UlEtacrQjhglIRHtzCvSieON7x7N9n5Y6kmmUCytFlpSAkJsNF1CjaTR7T ujaFYKdSF5XxP7Xn6AFfrr3MnS2lFaki119xY1LBFNh1zzvr0kJC77/gAY0NqlImtR0I xFnAja3vRQ5P46ZWRhtGJ2MagObUXcZdEBRTCdVYbHHIZ5CK+3zDIutcr+sZCEC3nGhl xWEQ== X-Gm-Message-State: AElRT7EgEtKguAteuBXvhv1Lly0U0YXbOGV91hbKiODWfKKy8qoHjVPM S6KZ+yKDjIzSpGYSWd2R7Rp1Ec4B X-Google-Smtp-Source: AG47ELuDz6DrGDZCRknGvGrNcc4aUbGzC0CvSQkF/tYhGNww1XFE3cC7Xb7x2XhrddJBt+nL7vC3+Q== X-Received: by 10.55.42.131 with SMTP id q3mr14633095qkq.77.1521426574119; Sun, 18 Mar 2018 19:29:34 -0700 (PDT) Received: from scythe-thinkpad ([2601:152:4303:1315:692c:d72d:b0f4:a53b]) by smtp.gmail.com with ESMTPSA id s186sm8990795qkf.70.2018.03.18.19.29.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 18 Mar 2018 19:29:33 -0700 (PDT) Message-ID: <1521426571.28105.2.camel@gmail.com> From: George Amanakis To: cake@lists.bufferbloat.net Date: Sun, 18 Mar 2018 22:29:31 -0400 In-Reply-To: <1521403235.24047.7.camel@gmail.com> References: <1521403235.24047.7.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.26.5 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Cake] 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 02:29:35 -0000 It seems the change was introduced here: https://patchwork.kernel.org/patch/9671147/ I drafted the following very simplistic patch, could somebody take a look at it? >From 0c3c135cc65fa1fdd2521490c8f1edee41edcea2 Mon Sep 17 00:00:00 2001 From: gamanakis Date: Sun, 18 Mar 2018 22:20:38 -0400 Subject: [PATCH] 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