From: George Amanakis <gamanakis@gmail.com>
To: cake@lists.bufferbloat.net, toke@toke.dk
Subject: [Cake] [PATCH] Fixes for 4.16
Date: Mon, 19 Mar 2018 13:11:52 -0400 [thread overview]
Message-ID: <20180319171152.27419-1-gamanakis@gmail.com> (raw)
In-Reply-To: <87k1u89ff2.fsf@toke.dk>
From: gamanakis <gamanakis@gmail.com>
Signed-off-by: George Amanakis <gamanakis@gmail.com>
---
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
next prev parent reply other threads:[~2018-03-19 17:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-18 20:00 [Cake] Compiling under net-next Georgios Amanakis
2018-03-19 2:29 ` George Amanakis
2018-03-19 10:16 ` Toke Høiland-Jørgensen
2018-03-19 10:40 ` Toke Høiland-Jørgensen
[not found] ` <CACvFP_ijNbkUU8mRCyAwe16qZ=SYMStq=9QiyTBizNhLx-vZtw@mail.gmail.com>
2018-03-19 16:09 ` [Cake] Fwd: " Georgios Amanakis
2018-03-19 16:52 ` Toke Høiland-Jørgensen
2018-03-19 17:11 ` George Amanakis [this message]
2018-03-20 9:33 ` [Cake] [PATCH] Fixes for 4.16 Toke Høiland-Jørgensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.bufferbloat.net/postorius/lists/cake.lists.bufferbloat.net/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180319171152.27419-1-gamanakis@gmail.com \
--to=gamanakis@gmail.com \
--cc=cake@lists.bufferbloat.net \
--cc=toke@toke.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox