projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[deliverable/linux.git]
/
net
/
sched
/
sch_qfq.c
diff --git
a/net/sched/sch_qfq.c
b/net/sched/sch_qfq.c
index 25566208f12b91e2cbbd8b4ad08c78b2f4d632e9..f0dd83cff90652dc870f5bc720f9ae1a404b8931 100644
(file)
--- a/
net/sched/sch_qfq.c
+++ b/
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;
}
}
This page took
0.029985 seconds
and
5
git commands to generate.