---

yaml --- r: 323083 b: refs/heads/master c: 7126195 h: refs/heads/master i: 323081: 6bf17af 323079: 55cfd48 v: v3
git-mirror · Sep 19, 2012 · 68d7134 · 68d7134
1 parent d497967
commit 68d7134
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15c041759bfcd9ab0a4e43f1c16e2644977d0467
+refs/heads/master: 71261956973ba9e0637848a5adb4a5819b4bae83
diff --git a/trunk/net/sched/sch_qfq.c b/trunk/net/sched/sch_qfq.c
@@ -865,7 +865,10 @@ static void qfq_update_start(struct qfq_sched *q, struct qfq_class *cl)
 		if (mask) {
 			struct qfq_group *next = qfq_ffs(q, mask);
 			if (qfq_gt(roundedF, next->F)) {
-				cl->S = next->F;
+				if (qfq_gt(limit, next->F))
+					cl->S = next->F;
+				else /* preserve timestamp correctness */
+					cl->S = limit;
 				return;
 			}
 		}