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>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 0883fcf..9240a95 100644 (file)
--- 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 --cc include/net/pkt_sched.h
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge