[BNX2]: Move rx indexes into bnx2_napi struct.

Rx related fields used in NAPI polling are moved from the main
bnx2 struct to the bnx2_napi struct.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 958fdda09c6b..b75795b4f8cf 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6512,6 +6512,14 @@ struct bnx2_napi {
 
 	u16			tx_cons;
 	u16			hw_tx_cons;
+
+	u32			rx_prod_bseq;
+	u16			rx_prod;
+	u16			rx_cons;
+
+	u16			rx_pg_prod;
+	u16			rx_pg_cons;
+
 };
 
 struct bnx2 {
@@ -6556,13 +6564,6 @@ struct bnx2 {
 	u32			rx_max_ring_idx;
 	u32			rx_max_pg_ring_idx;
 
-	u32			rx_prod_bseq;
-	u16			rx_prod;
-	u16			rx_cons;
-
-	u16			rx_pg_prod;
-	u16			rx_pg_cons;
-
 	u32			rx_csum;
 
 	struct sw_bd		*rx_buf_ring;