[PKT_SCHED]: Use mod_timer in sch_cbq.c

27571339 · Vinay K. Nallamothu · David S. Miller · c6afbf69 · 27571339
Commit 27571339 authored May 03, 2003 by Vinay K. Nallamothu Committed by David S. Miller May 03, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

net/sched/sch_cbq.c net/sched/sch_cbq.c +1 -3

No files found.
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -1056,11 +1056,9 @@ cbq_dequeue(struct Qdisc *sch)
 		sch->stats.overlimits++;
 		if (q->wd_expires && !netif_queue_stopped(sch->dev)) {
 			long delay = PSCHED_US2JIFFIE(q->wd_expires);
-			del_timer(&q->wd_timer);
 			if (delay <= 0)
 				delay = 1;
-			q->wd_timer.expires = jiffies + delay;
+			mod_timer(&q->wd_timer, jiffies + delay);
-			add_timer(&q->wd_timer);
 			sch->flags |= TCQ_F_THROTTLED;
 		}
 	}