netdevice: Move qdisc_list back into net_device proper.

And give it it's own lock.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1e839fa01434..3170bcef734b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -450,7 +450,6 @@ struct netdev_queue {
         spinlock_t              _xmit_lock;
         int                     xmit_lock_owner;
         struct Qdisc            *qdisc_sleeping;
-        struct list_head        qdisc_list;
 } ____cacheline_aligned_in_smp;
 
 /*
@@ -638,6 +637,8 @@ struct net_device
         unsigned int            real_num_tx_queues;
 
         unsigned long           tx_queue_len;   /* Max frames per queue allowed */
+        spinlock_t              qdisc_list_lock;
+        struct list_head        qdisc_list;
 
 /*
  * One part is mostly used on xmit path (device)