diff options
| author | Dariusz Swiderski <dms@cvs.openbsd.org> | 2009-11-25 18:47:37 +0000 |
|---|---|---|
| committer | Dariusz Swiderski <dms@cvs.openbsd.org> | 2009-11-25 18:47:37 +0000 |
| commit | e9b99126699fe3d233f1ead4d8dfd7df2bc3e481 (patch) | |
| tree | 73b8ae1180e97742bcb3d945a26652222ff13afe /sys/dev/pci/if_em_hw.c | |
| parent | 7fd637a9cffdf04e9892b25d1ca5a75e1cc0b636 (diff) | |
fix default phy_addr makes 82545 work again
ok claudio@
Diffstat (limited to 'sys/dev/pci/if_em_hw.c')
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 43c5e9b7ee8..edb6ce65eca 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.42 2009/11/25 13:28:13 dms Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.43 2009/11/25 18:47:36 dms Exp $ */ /* if_em_hw.c * Shared functions for accessing and configuring the MAC @@ -4320,7 +4320,10 @@ em_detect_gig_phy(struct em_hw *hw) return E1000_SUCCESS; /* default phy address, most phys reside here, but not all (ICH10) */ - hw->phy_addr = 0; + if (hw->mac_type != em_icp_xxxx) + hw->phy_addr = 1; + else + hw->phy_addr = 0; /* There is a phy at phy_addr 0 on EP80579 */ /* The 82571 firmware may still be configuring the PHY. In this * case, we cannot access the PHY until the configuration is done. So |