diff options
| author | yongari <yongari@FreeBSD.org> | 2011-05-31 01:30:58 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2011-05-31 01:30:58 +0000 |
| commit | 2adafc03232464837b5248397590e850ab6d7dc7 (patch) | |
| tree | 196a033ccf8c9b4ffdc603b12cd7e8c598866f9e | |
| parent | 3de43df666fc0c65ef09fad8946fa68943f2f93b (diff) | |
| download | FreeBSD-src-2adafc03232464837b5248397590e850ab6d7dc7.zip FreeBSD-src-2adafc03232464837b5248397590e850ab6d7dc7.tar.gz | |
Correctly check MAC running status before disabling TX/RX MACs.
| -rw-r--r-- | sys/dev/msk/if_msk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index 23538f7..be4ac5d 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -566,7 +566,7 @@ msk_miibus_statchg(device_t dev) msk_phy_writereg(sc_if, PHY_ADDR_MARV, PHY_MARV_INT_MASK, 0); /* Disable Rx/Tx MAC. */ gmac = GMAC_READ_2(sc, sc_if->msk_port, GM_GP_CTRL); - if ((GM_GPCR_RX_ENA | GM_GPCR_TX_ENA) != 0) { + if ((gmac & (GM_GPCR_RX_ENA | GM_GPCR_TX_ENA)) != 0) { gmac &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA); GMAC_WRITE_2(sc, sc_if->msk_port, GM_GP_CTRL, gmac); /* Read again to ensure writing. */ |
