pkt_sched: Make QDISC_RUNNING a qdisc state.

[safe/jmp/linux-2.6] / include / net / pkt_sched.h

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index cb95278..06a442d 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -88,8 +88,10 @@ extern void __qdisc_run(struct netdev_queue *txq);
 
 static inline void qdisc_run(struct netdev_queue *txq)
 {
+       struct Qdisc *q = txq->qdisc;
+
        if (!netif_tx_queue_stopped(txq) &&
-           !test_and_set_bit(__QUEUE_STATE_QDISC_RUNNING, &txq->state))
+           !test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
                __qdisc_run(txq);
 }