1 files changed, 28 insertions, 19 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 600bb23c4c2e..8d133802372b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1339,19 +1339,23 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 }
 
 
-void __netif_schedule(struct Qdisc *q)
+static inline void __netif_reschedule(struct Qdisc *q)
 {
-        if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
-                struct softnet_data *sd;
-                unsigned long flags;
+        struct softnet_data *sd;
+        unsigned long flags;
 
-                local_irq_save(flags);
-                sd = &__get_cpu_var(softnet_data);
-                q->next_sched = sd->output_queue;
-                sd->output_queue = q;
-                raise_softirq_irqoff(NET_TX_SOFTIRQ);
-                local_irq_restore(flags);
-        }
+        local_irq_save(flags);
+        sd = &__get_cpu_var(softnet_data);
+        q->next_sched = sd->output_queue;
+        sd->output_queue = q;
+        raise_softirq_irqoff(NET_TX_SOFTIRQ);
+        local_irq_restore(flags);
+}
+
+void __netif_schedule(struct Qdisc *q)
+{
+        if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state))
+                __netif_reschedule(q);
 }
 EXPORT_SYMBOL(__netif_schedule);
 
@@ -1800,9 +1804,13 @@ gso:
 
                 spin_lock(root_lock);
 
-                rc = qdisc_enqueue_root(skb, q);
-                qdisc_run(q);
-
+                if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
+                        kfree_skb(skb);
+                        rc = NET_XMIT_DROP;
+                } else {
+                        rc = qdisc_enqueue_root(skb, q);
+                        qdisc_run(q);
+                }
                 spin_unlock(root_lock);
 
                 goto out;
@@ -1974,15 +1982,15 @@ static void net_tx_action(struct softirq_action *h)
 
                         head = head->next_sched;
 
-                        smp_mb__before_clear_bit();
-                        clear_bit(__QDISC_STATE_SCHED, &q->state);
-
                         root_lock = qdisc_lock(q);
                         if (spin_trylock(root_lock)) {
+                                smp_mb__before_clear_bit();
+                                clear_bit(__QDISC_STATE_SCHED,
+                                          &q->state);
                                 qdisc_run(q);
                                 spin_unlock(root_lock);
                         } else {
-                                __netif_schedule(q);
+                                __netif_reschedule(q);
                         }
                 }
         }
@@ -2084,7 +2092,8 @@ static int ing_filter(struct sk_buff *skb)
         q = rxq->qdisc;
         if (q != &noop_qdisc) {
                 spin_lock(qdisc_lock(q));
-                result = qdisc_enqueue_root(skb, q);
+                if (likely(!test_bit(__QDISC_STATE_DEACTIVATED, &q->state)))
+                        result = qdisc_enqueue_root(skb, q);
                 spin_unlock(qdisc_lock(q));
         }