1 files changed, 7 insertions, 2 deletions

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 137db1cbde85..ac28f6a5d70e 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -46,6 +46,8 @@ EXPORT_SYMBOL(default_qdisc_ops);
  * - updates to tree and tree walking are only done under the rtnl mutex.
  */
 
+#define SKB_XOFF_MAGIC ((struct sk_buff *)1UL)
+
 static inline struct sk_buff *__skb_dequeue_bad_txq(struct Qdisc *q)
 {
         const struct netdev_queue *txq = q->dev_queue;
@@ -71,7 +73,7 @@ static inline struct sk_buff *__skb_dequeue_bad_txq(struct Qdisc *q)
                                 q->q.qlen--;
                         }
                 } else {
-                        skb = NULL;
+                        skb = SKB_XOFF_MAGIC;
                 }
         }
 
@@ -253,8 +255,11 @@ validate:
                 return skb;
 
         skb = qdisc_dequeue_skb_bad_txq(q);
-        if (unlikely(skb))
+        if (unlikely(skb)) {
+                if (skb == SKB_XOFF_MAGIC)
+                        return NULL;
                 goto bulk;
+        }
         skb = q->dequeue(q);
         if (skb) {
 bulk: