aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-12-09 11:34:54 -0800
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 15:27:20 -0500
commit6e23231b6509f17a251e6dfddb607d300680ac25 (patch)
tree5e65eb35ccd20f05988a09c29c3b93304249bddc
parent92f965e8c5433408d5a3805c6882b657eb6cbdb1 (diff)
[PATCH] sky2: device structure alignment
It is a useful optimization to rearrange the structure slightly to align receive and transmit portions. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/sky2.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 930680f50fc..7943dd42ac9 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1790,17 +1790,17 @@ struct sky2_port {
unsigned port;
u32 msg_enable;
- struct ring_info *tx_ring;
+ spinlock_t tx_lock ____cacheline_aligned_in_smp;
+ struct ring_info *tx_ring;
struct sky2_tx_le *tx_le;
- spinlock_t tx_lock;
- u32 tx_addr64;
u16 tx_cons; /* next le to check */
u16 tx_prod; /* next le to use */
+ u32 tx_addr64;
u16 tx_pending;
u16 tx_last_put;
u16 tx_last_mss;
- struct ring_info *rx_ring;
+ struct ring_info *rx_ring ____cacheline_aligned_in_smp;
struct sky2_rx_le *rx_le;
u32 rx_addr64;
u16 rx_next; /* next re to check */