tg3: Move producer ring struct to tg3_napi

Now that each NAPI instance has its own producer ring, it no longer
makes sense to keep the producer ring structure external.  This patch
migrates the producer ring struct to tg3_napi and pivots the code to the
new implementation.

Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d39426fc8a6..44733e4a68a 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2679,7 +2679,7 @@ struct tg3_napi {
         u32                             consmbox;
         u32                             rx_rcb_ptr;
         u16                             *rx_rcb_prod_idx;
-        struct tg3_rx_prodring_set      *prodring;
+        struct tg3_rx_prodring_set      prodring;
 
         struct tg3_rx_buffer_desc       *rx_rcb;
         struct tg3_tx_buffer_desc       *tx_ring;
@@ -2766,8 +2766,6 @@ struct tg3 {
         struct vlan_group               *vlgrp;
 #endif
 
-        struct tg3_rx_prodring_set      prodring[TG3_IRQ_MAX_VECS];
-
 
         /* begin "everything else" cacheline(s) section */
         struct rtnl_link_stats64        net_stats;