diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2006-01-29 01:31:36 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2006-08-31 22:15:41 +0200 |
| commit | d03d376dd29cae53bf70a21a0c26b306abe37326 (patch) | |
| tree | 06dbf38b03287ab45274c1a2105d590a65d312a3 /drivers/net/8139cp.c | |
| parent | 0ba894d420b845667e2981c2147af974a755fba2 (diff) | |
| download | blackbird-op-linux-d03d376dd29cae53bf70a21a0c26b306abe37326.tar.gz blackbird-op-linux-d03d376dd29cae53bf70a21a0c26b306abe37326.zip | |
8139cp: sync the device private data with its r8169 counterpart
struct cp_private is reorganized to be more easily compared between the
r8169 and the 8139cp drivers.
The alignment should not be impacted.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 072568120e48..9aef517d7502 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -352,23 +352,23 @@ struct cp_private { struct net_device_stats net_stats; struct cp_extra_stats cp_stats; - unsigned rx_tail ____cacheline_aligned; + unsigned rx_head ____cacheline_aligned; + unsigned rx_tail; struct cp_desc *rx_ring; struct sk_buff *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; + + unsigned rx_buf_sz; + unsigned wol_enabled : 1; /* Is Wake-on-LAN enabled? */ #if CP_VLAN_TAG_USED struct vlan_group *vlgrp; #endif - - unsigned int wol_enabled : 1; /* Is Wake-on-LAN enabled? */ + dma_addr_t ring_dma; struct mii_if_info mii_if; }; |
