diff options
| author | Semen Ustimenko <semenu@FreeBSD.org> | 2000-04-11 18:39:00 +0000 |
|---|---|---|
| committer | Semen Ustimenko <semenu@FreeBSD.org> | 2000-04-11 18:39:00 +0000 |
| commit | b72407814b976704d90f6bac55efb711df4010ae (patch) | |
| tree | 1aec617edf01fc091762aa2369b22dc32eefdff1 /sys/dev | |
| parent | 9cf306dfe60b2343fbabcdee289cd5daf0e351e9 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mii/nsphy.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 4c58a4e5d1e9..6591979117c9 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -129,12 +129,15 @@ static int nsphy_probe(dev) ma = device_get_ivars(dev); - if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_NATSEMI || - MII_MODEL(ma->mii_id2) != MII_MODEL_NATSEMI_DP83840) + if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_NATSEMI && + MII_MODEL(ma->mii_id2) == MII_MODEL_NATSEMI_DP83840) { + device_set_desc(dev, MII_STR_NATSEMI_DP83840); + } else if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_QUALSEMI && + MII_MODEL(ma->mii_id2) == MII_MODEL_QUALSEMI_QS6612) { + device_set_desc(dev, MII_STR_QUALSEMI_QS6612); + } else return (ENXIO); - device_set_desc(dev, MII_STR_NATSEMI_DP83840); - return (0); } @@ -426,5 +429,5 @@ nsphy_status(sc) mii->mii_media_active |= IFM_FDX; #endif } else - mii->mii_media_active = mii_media_from_bmcr(bmcr); + mii->mii_media_active |= mii_media_from_bmcr(bmcr); } |