From 2325d2abc4257e67a87056426aea05d2baf319fc Mon Sep 17 00:00:00 2001 From: Stefan Hasko Date: Fri, 21 Dec 2012 15:04:59 +0000 Subject: [PATCH] --- yaml --- r: 348019 b: refs/heads/master c: d2fe85da52e89b8012ffad010ef352a964725d5f h: refs/heads/master i: 348017: 432036cb920754cbc9da0f3d65388a13ba58fab8 348015: c1153955e8789843a5c2e5ad74b2f82808b7ad12 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_htb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d40f685a237a..a22de5c09ce3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8baf82b368d23aed5c96b01ed7110cdccdd18725 +refs/heads/master: d2fe85da52e89b8012ffad010ef352a964725d5f diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c index d2922c0ef57a..51561eafcb72 100644 --- a/trunk/net/sched/sch_htb.c +++ b/trunk/net/sched/sch_htb.c @@ -919,7 +919,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch) q->now = ktime_to_ns(ktime_get()); start_at = jiffies; - next_event = q->now + 5 * NSEC_PER_SEC; + next_event = q->now + 5LLU * NSEC_PER_SEC; for (level = 0; level < TC_HTB_MAXDEPTH; level++) { /* common case optimization - skip event handler quickly */