--- zzzz-none-000/linux-4.9.218/net/sched/sch_cbq.c	2020-04-02 15:20:41.000000000 +0000
+++ seale-7590ax-750/linux-4.9.218/net/sched/sch_cbq.c	2023-03-29 10:59:08.000000000 +0000
@@ -252,6 +252,7 @@
 		switch (result) {
 		case TC_ACT_QUEUED:
 		case TC_ACT_STOLEN:
+		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
 		case TC_ACT_SHOT:
 			return NULL;
@@ -1400,8 +1401,7 @@
 {
 	struct cbq_class *cl = (struct cbq_class *)arg;
 
-	if (cl->q->q.qlen == 0)
-		cbq_deactivate_class(cl);
+	cbq_deactivate_class(cl);
 }
 
 static unsigned long cbq_get(struct Qdisc *sch, u32 classid)