diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:54 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:54 -0400 |
| commit | 435b70e65d7cecbcf2a7e9495ded9d179d63f3ba (patch) | |
| tree | c501a17e7cb7dacff049e28b25ea5ee65a00bd06 /drivers | |
| parent | 4e83b7fad8d3fd55828baa4510885c7362e66a26 (diff) | |
| parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
| download | linux-3.10-435b70e65d7cecbcf2a7e9495ded9d179d63f3ba.tar.gz linux-3.10-435b70e65d7cecbcf2a7e9495ded9d179d63f3ba.tar.bz2 linux-3.10-435b70e65d7cecbcf2a7e9495ded9d179d63f3ba.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 1d7c99947e9..dece1838aaf 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -1467,8 +1467,8 @@ e1000_configure_tx(struct e1000_adapter *adapter) E1000_WRITE_REG(hw, TDBAL, (tdba & 0x00000000ffffffffULL)); E1000_WRITE_REG(hw, TDT, 0); E1000_WRITE_REG(hw, TDH, 0); - adapter->tx_ring[0].tdh = E1000_TDH; - adapter->tx_ring[0].tdt = E1000_TDT; + adapter->tx_ring[0].tdh = ((hw->mac_type >= e1000_82543) ? E1000_TDH : E1000_82542_TDH); + adapter->tx_ring[0].tdt = ((hw->mac_type >= e1000_82543) ? E1000_TDT : E1000_82542_TDT); break; } @@ -1871,8 +1871,8 @@ e1000_configure_rx(struct e1000_adapter *adapter) E1000_WRITE_REG(hw, RDBAL, (rdba & 0x00000000ffffffffULL)); E1000_WRITE_REG(hw, RDT, 0); E1000_WRITE_REG(hw, RDH, 0); - adapter->rx_ring[0].rdh = E1000_RDH; - adapter->rx_ring[0].rdt = E1000_RDT; + adapter->rx_ring[0].rdh = ((hw->mac_type >= e1000_82543) ? E1000_RDH : E1000_82542_RDH); + adapter->rx_ring[0].rdt = ((hw->mac_type >= e1000_82543) ? E1000_RDT : E1000_82542_RDT); break; } |