[BNX2]: Move tx indexes into bnx2_napi struct.

[linux-2.6-omap-h63xx.git] / drivers / net / bnx2.h

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 345b6db9a947d05c170375e1024eaa7d4320139f..958fdda09c6b7c67eb03c374fa58d16c4acb6500 100644 (file)
--- 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