2 files changed, 14 insertions, 4 deletions

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 2092d33194dd..8da32678ce18 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -30,6 +30,7 @@ struct qdisc_rate_table {
 enum qdisc_state_t {
         __QDISC_STATE_SCHED,
         __QDISC_STATE_DEACTIVATED,
+        __QDISC_STATE_RUNNING,
 };
 
 struct qdisc_size_table {
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 7e3fbe9cc936..39c144b6ff98 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -373,24 +373,33 @@ bool sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
  */
 static inline bool qdisc_restart(struct Qdisc *q, int *packets)
 {
+        bool more, validate, nolock = q->flags & TCQ_F_NOLOCK;
         spinlock_t *root_lock = NULL;
         struct netdev_queue *txq;
         struct net_device *dev;
         struct sk_buff *skb;
-        bool validate;
 
         /* Dequeue packet */
+        if (nolock && test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
+                return false;
+
         skb = dequeue_skb(q, &validate, packets);
-        if (unlikely(!skb))
+        if (unlikely(!skb)) {
+                if (nolock)
+                        clear_bit(__QDISC_STATE_RUNNING, &q->state);
                 return false;
+        }
 
-        if (!(q->flags & TCQ_F_NOLOCK))
+        if (!nolock)
                 root_lock = qdisc_lock(q);
 
         dev = qdisc_dev(q);
         txq = skb_get_tx_queue(dev, skb);
 
-        return sch_direct_xmit(skb, q, dev, txq, root_lock, validate);
+        more = sch_direct_xmit(skb, q, dev, txq, root_lock, validate);
+        if (nolock)
+                clear_bit(__QDISC_STATE_RUNNING, &q->state);
+        return more;
 }
 
 void __qdisc_run(struct Qdisc *q)