aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/pkt_sched.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-16 00:56:32 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-17 19:21:18 -0700
commite2627c8c2241bce45e368e150654d076b58a4595 (patch)
treee3ad7d1867339f254a324ba1acd5d8bdac1aca76 /include/net/pkt_sched.h
parentd3b753db7c4f1f37a98b51974d484fda5d86dab5 (diff)
pkt_sched: Make QDISC_RUNNING a qdisc state.
Currently it is associated with a netdev_queue, but when we have qdisc sharing that no longer makes any sense. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_sched.h')
-rw-r--r--include/net/pkt_sched.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index cb952781560..06a442d8518 100644
--- 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);
}