diff options
| author | marius <marius@FreeBSD.org> | 2011-11-18 21:23:13 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2011-11-18 21:23:13 +0000 |
| commit | 11f1c4bb4c881e6b19f272e3c87bbd54befb3146 (patch) | |
| tree | be8feddf7141782eeac3b3e5ff534a5682f7c1c1 | |
| parent | 6cf2a5617ad16242464cc11698e6c33bd522f237 (diff) | |
| download | FreeBSD-src-11f1c4bb4c881e6b19f272e3c87bbd54befb3146.zip FreeBSD-src-11f1c4bb4c881e6b19f272e3c87bbd54befb3146.tar.gz | |
There's no need to read DC_10BTSTAT twice in dcphy_status().
| -rw-r--r-- | sys/dev/dc/dcphy.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index 5c60ad5..ab44993 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -294,7 +294,7 @@ static void dcphy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; - int reg, anlpar, tstat = 0; + int anlpar, tstat; struct dc_softc *dc_sc; dc_sc = mii->mii_ifp->if_softc; @@ -305,13 +305,12 @@ dcphy_status(struct mii_softc *sc) if ((mii->mii_ifp->if_flags & IFF_UP) == 0) return; - reg = CSR_READ_4(dc_sc, DC_10BTSTAT); - if (!(reg & DC_TSTAT_LS10) || !(reg & DC_TSTAT_LS100)) + tstat = CSR_READ_4(dc_sc, DC_10BTSTAT); + if (!(tstat & DC_TSTAT_LS10) || !(tstat & DC_TSTAT_LS100)) mii->mii_media_status |= IFM_ACTIVE; if (CSR_READ_4(dc_sc, DC_10BTCTRL) & DC_TCTL_AUTONEGENBL) { /* Erg, still trying, I guess... */ - tstat = CSR_READ_4(dc_sc, DC_10BTSTAT); if ((tstat & DC_TSTAT_ANEGSTAT) != DC_ASTAT_AUTONEGCMP) { if ((DC_IS_MACRONIX(dc_sc) || DC_IS_PNICII(dc_sc)) && (tstat & DC_TSTAT_ANEGSTAT) == DC_ASTAT_DISABLE) @@ -351,9 +350,9 @@ dcphy_status(struct mii_softc *sc) * and hope that the user is clever enough to manually * change the media settings if we're wrong. */ - if (!(reg & DC_TSTAT_LS100)) + if (!(tstat & DC_TSTAT_LS100)) mii->mii_media_active |= IFM_100_TX | IFM_HDX; - else if (!(reg & DC_TSTAT_LS10)) + else if (!(tstat & DC_TSTAT_LS10)) mii->mii_media_active |= IFM_10_T | IFM_HDX; else mii->mii_media_active |= IFM_NONE; |
