[BNX2]: Move tx indexes into bnx2_napi struct.

Tx 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, 3 insertions, 3 deletions

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 345b6db9a947..958fdda09c6b 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6509,6 +6509,9 @@ struct bnx2_napi {
         struct status_block     *status_blk;
         u32                     last_status_idx;
         u32                     int_num;
+
+        u16                     tx_cons;
+        u16                     hw_tx_cons;
 };
 
 struct bnx2 {
@@ -6539,9 +6542,6 @@ struct bnx2 {
         u32             tx_bidx_addr;
         u32             tx_bseq_addr;
 
-        u16             tx_cons __attribute__((aligned(L1_CACHE_BYTES)));
-        u16             hw_tx_cons;
-
         struct bnx2_napi        bnx2_napi;
 
 #ifdef BCM_VLAN