Patchwork [net-next,v5,01/11] htb: use PSCHED_TICKS2NS()

login
register
mail settings
Submitter Jiri Pirko
Date Feb. 12, 2013, 10:11 a.m.
Message ID <1360663929-1023-2-git-send-email-jiri@resnulli.us>
Download mbox | patch
Permalink /patch/219759/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jiri Pirko - Feb. 12, 2013, 10:11 a.m.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
 net/sched/sch_htb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
David Miller - Feb. 13, 2013, midnight
From: Jiri Pirko <jiri@resnulli.us>
Date: Tue, 12 Feb 2013 11:11:59 +0100

> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> Acked-by: Eric Dumazet <edumazet@google.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 51561ea..476992c 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1512,8 +1512,8 @@  static int htb_change_class(struct Qdisc *sch, u32 classid,
 	htb_precompute_ratedata(&cl->rate);
 	htb_precompute_ratedata(&cl->ceil);
 
-	cl->buffer = hopt->buffer << PSCHED_SHIFT;
-	cl->cbuffer = hopt->buffer << PSCHED_SHIFT;
+	cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
+	cl->cbuffer = PSCHED_TICKS2NS(hopt->buffer);
 
 	sch_tree_unlock(sch);