On Fri, 14 Jul 2006 16:32:45 -0700 (PDT) David Miller <[EMAIL PROTECTED]> wrote:
> From: Jamal Hadi Salim <[EMAIL PROTECTED]> > Date: Fri, 14 Jul 2006 18:06:26 -0400 > > > On Fri, 2006-14-07 at 12:03 -0700, Stephen Hemminger wrote: > > > 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. Untested... > > > > > > Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]> > > > > Looks good to me. > > Me too, thanks Stephen. You forgot a semicolon. Yoichi Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]> diff -pruN -X 2.6.18-rc1/Documentation/dontdiff 2.6.18-rc1-orig/net/sched/sch_htb.c 2.6.18-rc1/net/sched/sch_htb.c --- 2.6.18-rc1-orig/net/sched/sch_htb.c 2006-07-15 17:16:48.561070000 +0900 +++ 2.6.18-rc1/net/sched/sch_htb.c 2006-07-15 17:15:44.513067250 +0900 @@ -1601,7 +1601,7 @@ static int htb_change_class(struct Qdisc /* set class to be in HTB_CAN_SEND state */ cl->tokens = hopt->buffer; cl->ctokens = hopt->cbuffer; - cl->mbuffer = PSCHED_JIFFIE2US(HZ*60) /* 1min */ + cl->mbuffer = PSCHED_JIFFIE2US(HZ*60); /* 1min */ PSCHED_GET_TIME(cl->t_c); cl->cmode = HTB_CAN_SEND; - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html