diff mbox

[net-next,1/7] htb: use PSCHED_TICKS2NS()

Message ID 1360328327-7144-2-git-send-email-jiri@resnulli.us
State Changes Requested, archived
Headers show

Commit Message

Jiri Pirko Feb. 8, 2013, 12:58 p.m. UTC 
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
 net/sched/sch_htb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Dumazet Feb. 8, 2013, 3:51 p.m. UTC | #1 
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote:
> Signed-off-by: Jiri Pirko <jiri@resnulli.us>
> ---
>  net/sched/sch_htb.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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);
>  

Acked-by: Eric Dumazet <edumazet@google.com>



--
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
diff mbox

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);