tg3: Move general int members to a per-int struct

[net-next-2.6.git] / drivers / net / tg3.h

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index aff3f046c9077b793b2266a0ef1b471f60fd858c..f46e6198a82b76313d804bbdad29ab99c46873b2 100644 (file)
--- 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 */