diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-07-14 16:32:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-14 16:32:27 -0700 |
| commit | b3a6251915df9e3d80d4a0d32bd8d24223906688 (patch) | |
| tree | bb69d8abc9d2e554e5e0907077c6db35710d9d0f /net/sched | |
| parent | 53602f92dd3691616478a40738353694bcfef171 (diff) | |
| download | linux-b3a6251915df9e3d80d4a0d32bd8d24223906688.tar.gz linux-b3a6251915df9e3d80d4a0d32bd8d24223906688.tar.bz2 linux-b3a6251915df9e3d80d4a0d32bd8d24223906688.zip | |
[PKT_SCHED] HTB: initialize upper bound properly
The upper bound for HTB time diff needs to be scaled to PSCHED
units rather than just assuming usecs. The field mbuffer is used
in TDIFF_SAFE(), as an upper bound.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_htb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 34afe41fa2f3..cd0a973b1128 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -196,7 +196,7 @@ struct htb_class struct qdisc_rate_table *rate; /* rate table of the class itself */ struct qdisc_rate_table *ceil; /* ceiling rate (limits borrows too) */ long buffer,cbuffer; /* token bucket depth/rate */ - long mbuffer; /* max wait time */ + psched_tdiff_t mbuffer; /* max wait time */ long tokens,ctokens; /* current number of tokens */ psched_time_t t_c; /* checkpoint time */ }; @@ -1601,7 +1601,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, /* set class to be in HTB_CAN_SEND state */ cl->tokens = hopt->buffer; cl->ctokens = hopt->cbuffer; - cl->mbuffer = 60000000; /* 1min */ + cl->mbuffer = PSCHED_JIFFIE2US(HZ*60) /* 1min */ PSCHED_GET_TIME(cl->t_c); cl->cmode = HTB_CAN_SEND; |