You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 3f608f0c41360b11b04c763f348b712f651c8bac Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
|
|
Date: Thu, 25 Jun 2020 22:12:09 +0200
|
|
Subject: [PATCH] sch_cake: fix a few style nits
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
I spotted a few nits when comparing the in-tree version of sch_cake with
|
|
the out-of-tree one: A redundant error variable declaration shadowing an
|
|
outer declaration, and an indentation alignment issue. Fix both of these.
|
|
|
|
Fixes: 046f6fd5daef ("sched: Add Common Applications Kept Enhanced (cake) qdisc")
|
|
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
net/sched/sch_cake.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/net/sched/sch_cake.c
|
|
+++ b/net/sched/sch_cake.c
|
|
@@ -2717,7 +2717,7 @@ static int cake_init(struct Qdisc *sch,
|
|
qdisc_watchdog_init(&q->watchdog, sch);
|
|
|
|
if (opt) {
|
|
- int err = cake_change(sch, opt, extack);
|
|
+ err = cake_change(sch, opt, extack);
|
|
|
|
if (err)
|
|
return err;
|
|
@@ -3034,7 +3034,7 @@ static int cake_dump_class_stats(struct
|
|
PUT_STAT_S32(BLUE_TIMER_US,
|
|
ktime_to_us(
|
|
ktime_sub(now,
|
|
- flow->cvars.blue_timer)));
|
|
+ flow->cvars.blue_timer)));
|
|
}
|
|
if (flow->cvars.dropping) {
|
|
PUT_STAT_S32(DROP_NEXT_US,
|