--- zzzz-none-000/linux-4.9.231/net/sched/sch_sfq.c	2020-07-22 07:10:54.000000000 +0000
+++ falcon-5530-730/linux-4.9.231/net/sched/sch_sfq.c	2022-08-31 08:19:49.000000000 +0000
@@ -185,6 +185,7 @@
 		switch (result) {
 		case TC_ACT_STOLEN:
 		case TC_ACT_QUEUED:
+		case TC_ACT_TRAP:
 			*qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
 		case TC_ACT_SHOT:
 			return 0;
@@ -485,8 +486,9 @@
 	struct sfq_slot *slot;
 
 	/* No active slots */
-	if (q->tail == NULL)
+	if (q->cur_depth == 0) {
 		return NULL;
+	}
 
 next_slot:
 	a = q->tail->next;