diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2006-01-28 19:31:36 -0500 |
---|---|---|
committer | Francois Romieu <romieu@fr.zoreil.com> | 2006-08-31 16:15:41 -0400 |
commit | d03d376dd29cae53bf70a21a0c26b306abe37326 (patch) | |
tree | 06dbf38b03287ab45274c1a2105d590a65d312a3 /drivers/net/8139cp.c | |
parent | 0ba894d420b845667e2981c2147af974a755fba2 (diff) |
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 { | |||
352 | struct net_device_stats net_stats; | 352 | struct net_device_stats net_stats; |
353 | struct cp_extra_stats cp_stats; | 353 | struct cp_extra_stats cp_stats; |
354 | 354 | ||
355 | unsigned rx_tail ____cacheline_aligned; | 355 | unsigned rx_head ____cacheline_aligned; |
356 | unsigned rx_tail; | ||
356 | struct cp_desc *rx_ring; | 357 | struct cp_desc *rx_ring; |
357 | struct sk_buff *rx_skb[CP_RX_RING_SIZE]; | 358 | struct sk_buff *rx_skb[CP_RX_RING_SIZE]; |
358 | unsigned rx_buf_sz; | ||
359 | 359 | ||
360 | unsigned tx_head ____cacheline_aligned; | 360 | unsigned tx_head ____cacheline_aligned; |
361 | unsigned tx_tail; | 361 | unsigned tx_tail; |
362 | |||
363 | struct cp_desc *tx_ring; | 362 | struct cp_desc *tx_ring; |
364 | struct ring_info tx_skb[CP_TX_RING_SIZE]; | 363 | struct ring_info tx_skb[CP_TX_RING_SIZE]; |
365 | dma_addr_t ring_dma; | 364 | |
365 | unsigned rx_buf_sz; | ||
366 | unsigned wol_enabled : 1; /* Is Wake-on-LAN enabled? */ | ||
366 | 367 | ||
367 | #if CP_VLAN_TAG_USED | 368 | #if CP_VLAN_TAG_USED |
368 | struct vlan_group *vlgrp; | 369 | struct vlan_group *vlgrp; |
369 | #endif | 370 | #endif |
370 | 371 | dma_addr_t ring_dma; | |
371 | unsigned int wol_enabled : 1; /* Is Wake-on-LAN enabled? */ | ||
372 | 372 | ||
373 | struct mii_if_info mii_if; | 373 | struct mii_if_info mii_if; |
374 | }; | 374 | }; |