diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2009-08-28 14:02:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-29 15:43:01 -0700 |
| commit | 898a56f8d8170c188e47ae3acb90d2ea9a585ebe (patch) | |
| tree | 6880f6bec0090eac6cd56458fc23e383b3f7d078 /drivers/net/tg3.h | |
| parent | 17375d25d3dcd3d4caf9456fa94f60e29d6b1146 (diff) | |
tg3: Move general int members to a per-int struct
This patch moves the last_tag, last_tag_irq, and hw_status device
members to a per-interrupt structure. It also adds a new interrupt
mailbox member (int_mbox) and converts the code to use it rather than a
direct preprocessor constant.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index aff3f046c90..f46e6198a82 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2492,6 +2492,13 @@ struct tg3_rx_prodring_set { struct tg3_napi { struct napi_struct napi ____cacheline_aligned; struct tg3 *tp; + struct tg3_hw_status *hw_status; + + u32 last_tag; + u32 last_irq_tag; + u32 int_mbox; + + dma_addr_t status_mapping; }; struct tg3 { @@ -2546,11 +2553,6 @@ struct tg3 { struct net_device *dev; struct pci_dev *pdev; - struct tg3_hw_status *hw_status; - dma_addr_t status_mapping; - u32 last_tag; - u32 last_irq_tag; - u32 msg_enable; /* begin "tx thread" cacheline section */ |