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>

3 files changed, 9 insertions, 2 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 0883fcf2d16a..9240a95793be 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -441,7 +441,6 @@ static inline void napi_synchronize(const struct napi_struct *n)
 enum netdev_queue_state_t
 {
         __QUEUE_STATE_XOFF,
-        __QUEUE_STATE_QDISC_RUNNING,
 };
 
 struct netdev_queue {
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;