diff --git a/[refs] b/[refs] index 3c68437ba442..44efb086cc23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8555a5948467e941acc34e8b1c30df4c1f2f5862 +refs/heads/master: 6a321cb370ad3db4ba6e405e638b3a42c41089b0 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index f8c3619d551f..505a3c6cb12d 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -447,12 +447,18 @@ enum netdev_queue_state_t }; struct netdev_queue { +/* + * read mostly part + */ struct net_device *dev; struct Qdisc *qdisc; unsigned long state; - spinlock_t _xmit_lock; - int xmit_lock_owner; struct Qdisc *qdisc_sleeping; +/* + * write mostly part + */ + spinlock_t _xmit_lock ____cacheline_aligned_in_smp; + int xmit_lock_owner; } ____cacheline_aligned_in_smp;