net/sched: Remove unnecessary WARNING condition for empty child qdisc in htb_activate

BitsByWill · opsiff · commit 3605af50d71c · 2025-09-09T18:46:10.000+08:00
[ Upstream commit 2c2192e ] The WARN_ON trigger based on !cl->leaf.q->q.qlen is unnecessary in htb_activate. htb_dequeue_tree already accounts for that scenario. Fixes: 1da177e ("Linux-2.6.12-rc2") Signed-off-by: William Liu <will@willsroot.io> Reviewed-by: Savino Dicanosa <savy@syst3mfailure.io> Link: https://patch.msgid.link/20250819033632.579854-1-will@willsroot.io Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 23ff73c9495db43134612cf286a0ab3364439525)
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
@@ -592,7 +592,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff)
  */
 static inline void htb_activate(struct htb_sched *q, struct htb_class *cl)
 {
-	WARN_ON(cl->level || !cl->leaf.q || !cl->leaf.q->q.qlen);
+	WARN_ON(cl->level || !cl->leaf.q);
 
 	if (!cl->prio_activity) {
 		cl->prio_activity = 1 << cl->prio;

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ htb_change_class_mode(struct htb_sched q, struct htb_class cl, s64 *diff)`
`592`	`592`	`*/`
`593`	`593`	`static inline void htb_activate(struct htb_sched q, struct htb_class cl)`
`594`	`594`	`{`
`595`		`- WARN_ON(cl->level \|\| !cl->leaf.q \|\| !cl->leaf.q->q.qlen);`
	`595`	`+ WARN_ON(cl->level \|\| !cl->leaf.q);`
`596`	`596`
`597`	`597`	`if (!cl->prio_activity) {`
`598`	`598`	`cl->prio_activity = 1 << cl->prio;`