Commit 96f93003 authored by Jeff Garzik's avatar Jeff Garzik

[netdrvr 8139cp] rearrange priv struct, add cacheline-align markers

suggested by Jes Sorensen.
parent 196c4ebd
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/cache.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -334,36 +335,36 @@ struct cp_extra_stats { ...@@ -334,36 +335,36 @@ struct cp_extra_stats {
}; };
struct cp_private { struct cp_private {
unsigned tx_head;
unsigned tx_tail;
unsigned rx_tail;
void *regs; void *regs;
struct net_device *dev; struct net_device *dev;
spinlock_t lock; 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 *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]; struct ring_info rx_skb[CP_RX_RING_SIZE];
unsigned rx_buf_sz; 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; dma_addr_t ring_dma;
#if CP_VLAN_TAG_USED #if CP_VLAN_TAG_USED
struct vlan_group *vlgrp; struct vlan_group *vlgrp;
#endif #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? */ unsigned int wol_enabled : 1; /* Is Wake-on-LAN enabled? */
u32 power_state[16]; u32 power_state[16];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment