diff options
| author | wpaul <wpaul@FreeBSD.org> | 2000-04-14 15:31:48 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 2000-04-14 15:31:48 +0000 |
| commit | 51c489181319e1c5698f1b9117da76a11b62f3f5 (patch) | |
| tree | 8e403d1a1e4c0d088dbb8e59e848f793a4b1e08c /sys/dev/mii/mlphy.c | |
| parent | b3f8b52065d86419edd5ba36583095638590ed83 (diff) | |
| download | FreeBSD-src-51c489181319e1c5698f1b9117da76a11b62f3f5.zip FreeBSD-src-51c489181319e1c5698f1b9117da76a11b62f3f5.tar.gz | |
Change && to || in probe routine so that the mlphy driver doesn't
incorrectly attach itself to ThunderLAN adapters which happen to have
a PHY who's model number happens out to be 0.
Problem reported by: Peter L. Thomas <Pete@painless-computing.com>
Diffstat (limited to 'sys/dev/mii/mlphy.c')
| -rw-r--r-- | sys/dev/mii/mlphy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c index 2bf1767..91e0ffb 100644 --- a/sys/dev/mii/mlphy.c +++ b/sys/dev/mii/mlphy.c @@ -113,7 +113,7 @@ static int mlphy_probe(dev) /* * Micro Linear PHY reports oui == 0 model == 0 */ - if (MII_OUI(ma->mii_id1, ma->mii_id2) != 0 && + if (MII_OUI(ma->mii_id1, ma->mii_id2) != 0 || MII_MODEL(ma->mii_id2) != 0) return (ENXIO); |
