diff options
-rw-r--r-- | drivers/net/sky2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 930680f50fca..7943dd42ac94 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -1790,17 +1790,17 @@ struct sky2_port { | |||
1790 | unsigned port; | 1790 | unsigned port; |
1791 | u32 msg_enable; | 1791 | u32 msg_enable; |
1792 | 1792 | ||
1793 | struct ring_info *tx_ring; | 1793 | spinlock_t tx_lock ____cacheline_aligned_in_smp; |
1794 | struct ring_info *tx_ring; | ||
1794 | struct sky2_tx_le *tx_le; | 1795 | struct sky2_tx_le *tx_le; |
1795 | spinlock_t tx_lock; | ||
1796 | u32 tx_addr64; | ||
1797 | u16 tx_cons; /* next le to check */ | 1796 | u16 tx_cons; /* next le to check */ |
1798 | u16 tx_prod; /* next le to use */ | 1797 | u16 tx_prod; /* next le to use */ |
1798 | u32 tx_addr64; | ||
1799 | u16 tx_pending; | 1799 | u16 tx_pending; |
1800 | u16 tx_last_put; | 1800 | u16 tx_last_put; |
1801 | u16 tx_last_mss; | 1801 | u16 tx_last_mss; |
1802 | 1802 | ||
1803 | struct ring_info *rx_ring; | 1803 | struct ring_info *rx_ring ____cacheline_aligned_in_smp; |
1804 | struct sky2_rx_le *rx_le; | 1804 | struct sky2_rx_le *rx_le; |
1805 | u32 rx_addr64; | 1805 | u32 rx_addr64; |
1806 | u16 rx_next; /* next re to check */ | 1806 | u16 rx_next; /* next re to check */ |