summaryrefslogtreecommitdiffstats
path: root/include/net
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
parentd3b753db7c4f1f37a98b51974d484fda5d86dab5 (diff)
downloadlinux-e2627c8c2241bce45e368e150654d076b58a4595.tar.gz
linux-e2627c8c2241bce45e368e150654d076b58a4595.tar.bz2
linux-e2627c8c2241bce45e368e150654d076b58a4595.zip
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')
-rw-r--r--include/net/pkt_sched.h4
-rw-r--r--include/net/sch_generic.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index cb9527815606..06a442d85186 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);
}
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index b96c3d9e10a8..bc2a09da21b1 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -23,6 +23,11 @@ struct qdisc_rate_table
int refcnt;
};
+enum qdisc_state_t
+{
+ __QDISC_STATE_RUNNING,
+};
+
struct Qdisc
{
int (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
@@ -36,6 +41,7 @@ struct Qdisc
u32 handle;
u32 parent;
atomic_t refcnt;
+ unsigned long state;
struct sk_buff *gso_skb;
struct sk_buff_head q;
struct netdev_queue *dev_queue;