diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 515fd25bf0fc..e835acacb479 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -449,6 +449,7 @@ static inline void napi_synchronize(const struct napi_struct *n) | |||
449 | #endif | 449 | #endif |
450 | 450 | ||
451 | struct netdev_queue { | 451 | struct netdev_queue { |
452 | spinlock_t lock; | ||
452 | struct net_device *dev; | 453 | struct net_device *dev; |
453 | }; | 454 | }; |
454 | 455 | ||
@@ -629,7 +630,7 @@ struct net_device | |||
629 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ | 630 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ |
630 | 631 | ||
631 | struct netdev_queue rx_queue; | 632 | struct netdev_queue rx_queue; |
632 | struct netdev_queue tx_queue; | 633 | struct netdev_queue tx_queue ____cacheline_aligned_in_smp; |
633 | 634 | ||
634 | /* ingress path synchronizer */ | 635 | /* ingress path synchronizer */ |
635 | spinlock_t ingress_lock; | 636 | spinlock_t ingress_lock; |
@@ -639,7 +640,6 @@ struct net_device | |||
639 | * Cache line mostly used on queue transmit path (qdisc) | 640 | * Cache line mostly used on queue transmit path (qdisc) |
640 | */ | 641 | */ |
641 | /* device queue lock */ | 642 | /* device queue lock */ |
642 | spinlock_t queue_lock ____cacheline_aligned_in_smp; | ||
643 | struct Qdisc *qdisc; | 643 | struct Qdisc *qdisc; |
644 | struct Qdisc *qdisc_sleeping; | 644 | struct Qdisc *qdisc_sleeping; |
645 | struct list_head qdisc_list; | 645 | struct list_head qdisc_list; |