| From 2cb40a526b5581038a1cb3d67b3ba7d3fafdaa43 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 19 Aug 2025 03:36:59 +0000 |
| Subject: net/sched: Remove unnecessary WARNING condition for empty child qdisc |
| in htb_activate |
| |
| From: William Liu <will@willsroot.io> |
| |
| [ 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 <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> |
| --- |
| net/sched/sch_htb.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c |
| index 1021681a5718..2c13de8bf16f 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; |
| -- |
| 2.50.1 |
| |