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>

2 files changed, 4 insertions, 8 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 633a44c6fa5e..df702a7b3db5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -451,6 +451,9 @@ static inline void napi_synchronize(const struct napi_struct *n)
 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 net_device
 
         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. */
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index f70e9b39ebaf..16fbf672e0b2 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -223,7 +223,7 @@ int  irda_device_is_receiving(struct net_device *dev);
 /* Interface for internal use */
 static inline int irda_device_txqueue_empty(const struct net_device *dev)
 {
-        return skb_queue_empty(&dev->qdisc->q);
+        return skb_queue_empty(&dev->tx_queue.qdisc->q);
 }
 int  irda_device_set_raw_mode(struct net_device* self, int status);
 struct net_device *alloc_irdadev(int sizeof_priv);