From 96f9300355d6c5bbf657d6497468f5f899c016a8 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 6 Apr 2004 01:20:43 -0400 Subject: [PATCH] [netdrvr 8139cp] rearrange priv struct, add cacheline-align markers suggested by Jes Sorensen. --- drivers/net/8139cp.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 9bfeed893229d..e31c8bc7bb0b5 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include @@ -334,36 +335,36 @@ struct cp_extra_stats { }; struct cp_private { - unsigned tx_head; - unsigned tx_tail; - unsigned rx_tail; - void *regs; struct net_device *dev; spinlock_t lock; + u32 msg_enable; + + struct pci_dev *pdev; + u32 rx_config; + u16 cpcmd; + struct net_device_stats net_stats; + struct cp_extra_stats cp_stats; + struct cp_dma_stats *nic_stats; + dma_addr_t nic_stats_dma; + + unsigned rx_tail ____cacheline_aligned; struct cp_desc *rx_ring; - struct cp_desc *tx_ring; - struct ring_info tx_skb[CP_TX_RING_SIZE]; struct ring_info rx_skb[CP_RX_RING_SIZE]; unsigned rx_buf_sz; + + unsigned tx_head ____cacheline_aligned; + unsigned tx_tail; + + struct cp_desc *tx_ring; + struct ring_info tx_skb[CP_TX_RING_SIZE]; dma_addr_t ring_dma; #if CP_VLAN_TAG_USED struct vlan_group *vlgrp; #endif - u32 msg_enable; - - struct net_device_stats net_stats; - struct cp_extra_stats cp_stats; - struct cp_dma_stats *nic_stats; - dma_addr_t nic_stats_dma; - - struct pci_dev *pdev; - u32 rx_config; - u16 cpcmd; - unsigned int wol_enabled : 1; /* Is Wake-on-LAN enabled? */ u32 power_state[16]; -- 2.53.0