diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 22:02:52 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 22:02:52 +0400 |
| commit | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (patch) | |
| tree | eb6b35bb250f46d75853764bd9309c75e4f03c72 /drivers/net/bnx2.h | |
| parent | ed0da6fc9d3096f54c4a76737eeae57ac81418cf (diff) | |
| parent | 78eb887733ec8ff5d6e6c69e3c32a187a9303622 (diff) | |
| download | linux-ef7d1b244fa6c94fb76d5f787b8629df64ea4046.tar.xz | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 658c5ee95c73..fe804763c607 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -3890,10 +3890,6 @@ struct bnx2 { u32 tx_prod_bseq __attribute__((aligned(L1_CACHE_BYTES))); u16 tx_prod; - struct tx_bd *tx_desc_ring; - struct sw_bd *tx_buf_ring; - int tx_ring_size; - u16 tx_cons __attribute__((aligned(L1_CACHE_BYTES))); u16 hw_tx_cons; @@ -3916,9 +3912,11 @@ struct bnx2 { struct sw_bd *rx_buf_ring; struct rx_bd *rx_desc_ring[MAX_RX_RINGS]; - /* Only used to synchronize netif_stop_queue/wake_queue when tx */ - /* ring is full */ - spinlock_t tx_lock; + /* TX constants */ + struct tx_bd *tx_desc_ring; + struct sw_bd *tx_buf_ring; + int tx_ring_size; + u32 tx_wake_thresh; /* End of fields used in the performance code paths. */ |