diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:34 -0400 |
| commit | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (patch) | |
| tree | c6d841ae9b73d6b7d6a887c21ce378cebc9c97f7 /drivers/net/bnx2.h | |
| parent | [PATCH] smc91x: disable DMA mode on the logicpd pxa270 (diff) | |
| parent | Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-41ace1861a93f12f70ff10026fb1539fea38fcf8.tar.xz linux-dev-41ace1861a93f12f70ff10026fb1539fea38fcf8.zip | |
Merge branch 'master' into upstream-fixes
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. */ |