summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.h
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2007-12-20 19:56:59 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:57:36 -0800
commita550c99bc39caf292ed214c0c9c2c4d0b9c95161 (patch)
tree061b23ae2c3478f8863a1978117ac394b9b7a6b0 /drivers/net/bnx2.h
parent35efa7c1f4aa868d4a948a9069f20ccef1b3b28d (diff)
downloadlinux-a550c99bc39caf292ed214c0c9c2c4d0b9c95161.tar.bz2
[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>
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r--drivers/net/bnx2.h6
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