svn commit: r185264 - in releng/6.4/sys: . pci

[Marius Strobl]

Author: marius
Date: Mon Nov 24 21:26:26 2008
New Revision: 185264
URL: http://svn.freebsd.org/changeset/base/185264

Log:
  MF stable/6: r185263
  
  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 though.
  
  Approved by:	re (kensmith)

Modified:
  releng/6.4/sys/   (props changed)
  releng/6.4/sys/pci/if_dc.c

Modified: releng/6.4/sys/pci/if_dc.c
==============================================================================
--- releng/6.4/sys/pci/if_dc.c	Mon Nov 24 21:18:40 2008	(r185263)
+++ releng/6.4/sys/pci/if_dc.c	Mon Nov 24 21:26:26 2008	(r185264)
@@ -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))