---

yaml --- r: 117600 b: refs/heads/master c: 23dd7bb h: refs/heads/master v: v3
git-mirror · Sep 6, 2008 · 95952c9 · 95952c9
1 parent c8344f0
commit 95952c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76369470b7e5f97fc1a8af83c45b9ff739b08cb6
+refs/heads/master: 23dd7bb09bd8d7efd8a602aed97b93d52f85e675
diff --git a/trunk/net/sched/sch_cbq.c b/trunk/net/sched/sch_cbq.c
@@ -545,9 +545,10 @@ static void cbq_ovl_delay(struct cbq_class *cl)
 			expires = ktime_set(0, 0);
 			expires = ktime_add_ns(expires, PSCHED_US2NS(sched));
 			if (hrtimer_try_to_cancel(&q->delay_timer) &&
-			    ktime_to_ns(ktime_sub(q->delay_timer.expires,
-						  expires)) > 0)
-				q->delay_timer.expires = expires;
+			    ktime_to_ns(ktime_sub(
+					hrtimer_get_expires(&q->delay_timer),
+					expires)) > 0)
+				hrtimer_set_expires(&q->delay_timer, expires);
 			hrtimer_restart(&q->delay_timer);
 			cl->delayed = 1;
 			cl->xstats.overactions++;