The patch titled
8139cp: sync the device private data with its r8169 counterpart
has been added to the -mm tree. Its filename is
8139cp-sync-the-device-private-data-with-its-r8169-counterpart.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: 8139cp: sync the device private data with its r8169 counterpart
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/8139cp.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/net/8139cp.c~8139cp-sync-the-device-private-data-with-its-r8169-counterpart drivers/net/8139cp.c
--- a/drivers/net/8139cp.c~8139cp-sync-the-device-private-data-with-its-r8169-counterpart
+++ a/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;
};
_
Patches currently in -mm which might be from romieu@xxxxxxxxxxxxx are
8139cp-trim-ring_info.patch
8139cp-remove-gratuitous-indirection.patch
8139cp-ring_info-removal-for-the-receive-path.patch
8139cp-sync-the-device-private-data-with-its-r8169-counterpart.patch
8139cp-removal-of-useless-bug_on-check.patch
8139cp-pci_get_drvdatapdev-can-not-be-null-in-suspend-handler.patch
8139cp-use-pci_device-to-shorten-the-pci-device-table.patch
git-r8169.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
