diff --git a/[refs] b/[refs]
index 2ce2b0fcdd90..3f9a551dfe46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0143efa96671dc51dab9bba776a66f9bfa1757f
+refs/heads/master: 40dd2d546198e7bbb8d3fe718957b158caa3fe52
diff --git a/trunk/net/sched/sch_qfq.c b/trunk/net/sched/sch_qfq.c
index c34af93ddfe2..6b7ce803d07c 100644
--- a/trunk/net/sched/sch_qfq.c
+++ b/trunk/net/sched/sch_qfq.c
@@ -1279,7 +1279,8 @@ static void qfq_schedule_agg(struct qfq_sched *q, struct qfq_aggregate *agg)
 		/* group was surely ineligible, remove */
 		__clear_bit(grp->index, &q->bitmaps[IR]);
 		__clear_bit(grp->index, &q->bitmaps[IB]);
-	} else if (!q->bitmaps[ER] && qfq_gt(roundedS, q->V))
+	} else if (!q->bitmaps[ER] && qfq_gt(roundedS, q->V) &&
+		   q->in_serv_agg == NULL)
 		q->V = roundedS;
 
 	grp->S = roundedS;