diff --git a/[refs] b/[refs] index e0e68ec088e6..9a3019ce2ff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6c93e1ddde769010f9c81bbfab41a9844c0e9ba +refs/heads/master: 2724a1a55f847e2b5007cf294e03cfa09d0d22f3 diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c index cd0a973b1128..cc5f339e6f91 100644 --- a/trunk/net/sched/sch_htb.c +++ b/trunk/net/sched/sch_htb.c @@ -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 = PSCHED_JIFFIE2US(HZ*60) /* 1min */ + cl->mbuffer = PSCHED_JIFFIE2US(HZ*60); /* 1min */ PSCHED_GET_TIME(cl->t_c); cl->cmode = HTB_CAN_SEND;