---

yaml
---
r: 111787
b: refs/heads/master
c: ebf0598
h: refs/heads/master
i:
  111785: e0d913b
  111783: 72a0544
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0876520b0b721bedafd9cec3b1b0624ae566eee
+refs/heads/master: ebf059821ed8a36acd706484b719d14d212ada32

trunk/net/sched/sch_generic.c

@@ -52,11 +52,21 @@ static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q)
 
 static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
 {
-	struct sk_buff *skb;
-
-	skb = __skb_dequeue(&q->requeue);
-	if (!skb)
+	struct sk_buff *skb = skb_peek(&q->requeue);
+
+	if (unlikely(skb)) {
+		struct net_device *dev = qdisc_dev(q);
+		struct netdev_queue *txq;
+
+		/* check the reason of requeuing without tx lock first */
+		txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
+		if (!netif_tx_queue_stopped(txq) && !netif_tx_queue_frozen(txq))
+			__skb_unlink(skb, &q->requeue);
+		else
+			skb = NULL;
+	} else {
 		skb = q->dequeue(q);
+	}
 
 	return skb;
 }