Date: Mon, 24 Nov 2008 21:18:40 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r185263 - stable/6/sys/pci Message-ID: <200811242118.mAOLIemj098580@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Mon Nov 24 21:18:40 2008 New Revision: 185263 URL: http://svn.freebsd.org/changeset/base/185263 Log: Revert r182461 except for the introduction of the DC_HAS_BROKEN_RXSTATE() macro for the upcoming release as doing MII-operations on DM9102A while the link is up has turned out to occasionally cause panics. This again prevents the link state form ever being checked once it's up, which is considered less worse than the panics tough. Approved by: re (kensmith) Modified: stable/6/sys/pci/if_dc.c Modified: stable/6/sys/pci/if_dc.c ============================================================================== --- stable/6/sys/pci/if_dc.c Mon Nov 24 21:10:08 2008 (r185262) +++ stable/6/sys/pci/if_dc.c Mon Nov 24 21:18:40 2008 (r185263) @@ -2916,12 +2916,8 @@ dc_tick(void *xsc) if (sc->dc_link == 0) mii_tick(mii); } else { - /* - * For NICs which never report DC_RXSTATE_WAIT, we - * have to bite the bullet... - */ - if ((DC_HAS_BROKEN_RXSTATE(sc) || (CSR_READ_4(sc, - DC_ISR) & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT) && + r = CSR_READ_4(sc, DC_ISR); + if ((r & DC_ISR_RX_STATE) == DC_RXSTATE_WAIT && sc->dc_cdata.dc_tx_cnt == 0) { mii_tick(mii); if (!(mii->mii_media_status & IFM_ACTIVE))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811242118.mAOLIemj098580>