From owner-svn-src-all@FreeBSD.ORG  Mon Nov 24 21:18:40 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 695EC1065672;
	Mon, 24 Nov 2008 21:18:40 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BBAB8FC13;
	Mon, 24 Nov 2008 21:18:40 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOLIeXE098581;
	Mon, 24 Nov 2008 21:18:40 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAOLIemj098580;
	Mon, 24 Nov 2008 21:18:40 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200811242118.mAOLIemj098580@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 24 Nov 2008 21:18:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185263 - stable/6/sys/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Nov 2008 21:18:40 -0000

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))