Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

8139cp: sync the device private data with its r8169 counterpart

Browse source 
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>
This commit is contained in:
Francois Romieu 2006-01-29 01:31:36 +01:00
parent 0ba894d420
commit d03d376dd2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/8139cp.c
View file

@ -352,23 +352,23 @@ struct cp_private {
struct net_device_stats net_stats; struct net_device_stats net_stats;
struct cp_extra_stats cp_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 cp_desc *rx_ring;
struct sk_buff *rx_skb[CP_RX_RING_SIZE]; struct sk_buff *rx_skb[CP_RX_RING_SIZE];
unsigned rx_buf_sz;
unsigned tx_head ____cacheline_aligned; unsigned tx_head ____cacheline_aligned;
unsigned tx_tail; unsigned tx_tail;
struct cp_desc *tx_ring; struct cp_desc *tx_ring;
struct ring_info tx_skb[CP_TX_RING_SIZE]; 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 #if CP_VLAN_TAG_USED
struct vlan_group *vlgrp; struct vlan_group *vlgrp;
#endif #endif
dma_addr_t ring_dma;
unsigned int wol_enabled : 1; /* Is Wake-on-LAN enabled? */
struct mii_if_info mii_if; struct mii_if_info mii_if;
}; };