diff options
| author | David Hill <dhill@cvs.openbsd.org> | 2011-05-02 18:16:59 +0000 |
|---|---|---|
| committer | David Hill <dhill@cvs.openbsd.org> | 2011-05-02 18:16:59 +0000 |
| commit | ffd9b49d07fa804db1546706cb434f9fbf49aa46 (patch) | |
| tree | de48376920e33ae8563b060a9763f22cd2f5d4a5 /sys | |
| parent | b261a589e4d8920a0f39fc773df155ad6a5322c4 (diff) | |
remove workaround found in FreeBSD driver but not in Intel's official
driver.
Fixes 82578DC from only being able to negotiate at 10baseT.
ok jsg@
please commit mikeb@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 45fc26899cc..7ec5f953dda 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.64 2011/05/02 12:25:42 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.65 2011/05/02 18:16:58 dhill Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -9863,20 +9863,6 @@ em_hv_phy_workarounds_ich8lan(struct em_hw *hw) } if (hw->phy_type == em_phy_82578) { - if (hw->revision_id < 3) { - /* PHY config */ - ret_val = em_write_phy_reg(hw, (1 << 6) | 0x29, - 0x66C0); - if (ret_val) - goto out; - - /* PHY config */ - ret_val = em_write_phy_reg(hw, (1 << 6) | 0x1E, - 0xFFFF); - if (ret_val) - goto out; - } - /* * Return registers to default by doing a soft reset then * writing 0x3140 to the control register. |