---

yaml --- r: 15787 b: refs/heads/master c: 6e23231 h: refs/heads/master i: 15785: d7f968e 15783: 4b3ebc5 v: v3
git-mirror · Dec 12, 2005 · 71d3829 · 71d3829
1 parent 8084243
commit 71d3829
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92f965e8c5433408d5a3805c6882b657eb6cbdb1
+refs/heads/master: 6e23231b6509f17a251e6dfddb607d300680ac25
diff --git a/trunk/drivers/net/sky2.h b/trunk/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 */