From 8ae6e363b2b84d96ee1d34d84725f7b995dec4c3 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 12 Sep 2006 12:03:54 -0400 Subject: [PATCH] --- yaml --- r: 35295 b: refs/heads/master c: 435b70e65d7cecbcf2a7e9495ded9d179d63f3ba h: refs/heads/master i: 35293: 1988d57bb509ee564bd0aa3312fa3c585ef378e9 35291: 6c35b056f242b35325d417333cab9572cfc2993d 35287: 6abab42639b6b48a5c869d135802882658922853 35279: 68d967de65b2bb09c7c48f3efc7c84aafe456192 35263: 7cfe45d3c953c1264a1f08451cb3a74d71fdc28f v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e2b90a062619..6598cb081aff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e83b7fad8d3fd55828baa4510885c7362e66a26 +refs/heads/master: 435b70e65d7cecbcf2a7e9495ded9d179d63f3ba diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 1d7c99947e92..dece1838aaf5 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/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; }