net: Use queue aware tests throughout.

[mirror_ubuntu-zesty-kernel.git] / include / net / pkt_sched.h

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index d58c1a5eb84549ea1b528757cd380c2c4840776f..cb9527815606ccc717ca7492b6a0796a2bd9fb97 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -88,9 +88,7 @@ extern void __qdisc_run(struct netdev_queue *txq);
 
 static inline void qdisc_run(struct netdev_queue *txq)
 {
-       struct net_device *dev = txq->dev;
-
-       if (!netif_queue_stopped(dev) &&
+       if (!netif_tx_queue_stopped(txq) &&
            !test_and_set_bit(__QUEUE_STATE_QDISC_RUNNING, &txq->state))
                __qdisc_run(txq);
 }