From: William Liu Date: Tue, 19 Aug 2025 03:36:59 +0000 (+0000) Subject: net/sched: Remove unnecessary WARNING condition for empty child qdisc in htb_activate X-Git-Tag: v6.12.44~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23ff73c9495db43134612cf286a0ab3364439525;p=thirdparty%2Fkernel%2Fstable.git net/sched: Remove unnecessary WARNING condition for empty child qdisc in htb_activate [ Upstream commit 2c2192e5f9c7c2892fe2363244d1387f62710d83 ] 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: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: William Liu Reviewed-by: Savino Dicanosa Link: https://patch.msgid.link/20250819033632.579854-1-will@willsroot.io Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 1021681a57182..2c13de8bf16f4 100644 --- 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;