netdev: Move rest of qdisc state into struct netdev_queue
Now qdisc, qdisc_sleeping, and qdisc_list also live there.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 633a44c..df702a7 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -451,6 +451,9 @@
struct netdev_queue {
spinlock_t lock;
struct net_device *dev;
+ struct Qdisc *qdisc;
+ struct Qdisc *qdisc_sleeping;
+ struct list_head qdisc_list;
};
/*
@@ -634,13 +637,6 @@
struct Qdisc *qdisc_ingress;
-/*
- * Cache line mostly used on queue transmit path (qdisc)
- */
- /* device queue lock */
- struct Qdisc *qdisc;
- struct Qdisc *qdisc_sleeping;
- struct list_head qdisc_list;
unsigned long tx_queue_len; /* Max frames per queue allowed */
/* Partially transmitted GSO packet. */