diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-11-01 11:48:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:12:00 -0500 |
| commit | 6a042dab19567fc888d5b87ce6ab68ac02aea1dc (patch) | |
| tree | ec035c4a40ab27524addb3c247dc58eae423d460 /drivers | |
| parent | 2df7d59f287236a636fb2d7e05879e65c8c56492 (diff) | |
e1000: Only set IDE for tx when we are using TIDV/TADV
Spec fix: don't set IDE unless we are actually setting the tx
int delay time.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 705e654c368a..fe22ae8f0a3d 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -1580,8 +1580,11 @@ e1000_configure_tx(struct e1000_adapter *adapter) | |||
| 1580 | e1000_config_collision_dist(hw); | 1580 | e1000_config_collision_dist(hw); |
| 1581 | 1581 | ||
| 1582 | /* Setup Transmit Descriptor Settings for eop descriptor */ | 1582 | /* Setup Transmit Descriptor Settings for eop descriptor */ |
| 1583 | adapter->txd_cmd = E1000_TXD_CMD_IDE | E1000_TXD_CMD_EOP | | 1583 | adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS; |
| 1584 | E1000_TXD_CMD_IFCS; | 1584 | |
| 1585 | /* only set IDE if we are delaying interrupts using the timers */ | ||
| 1586 | if (adapter->tx_int_delay) | ||
| 1587 | adapter->txd_cmd |= E1000_TXD_CMD_IDE; | ||
| 1585 | 1588 | ||
| 1586 | if (hw->mac_type < e1000_82543) | 1589 | if (hw->mac_type < e1000_82543) |
| 1587 | adapter->txd_cmd |= E1000_TXD_CMD_RPS; | 1590 | adapter->txd_cmd |= E1000_TXD_CMD_RPS; |