From owner-svn-src-all@FreeBSD.ORG  Thu May 12 14:27:29 2011
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 6147A106564A;
	Thu, 12 May 2011 14:27:29 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 50A118FC17;
	Thu, 12 May 2011 14:27:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4CERTiC040619;
	Thu, 12 May 2011 14:27:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4CERTwI040617;
	Thu, 12 May 2011 14:27:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201105121427.p4CERTwI040617@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 12 May 2011 14:27:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221813 - head/sys/dev/bm
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: Thu, 12 May 2011 14:27:29 -0000

Author: nwhitehorn
Date: Thu May 12 14:27:28 2011
New Revision: 221813
URL: http://svn.freebsd.org/changeset/base/221813

Log:
  Remove some hacks to handle strange behavior of LXT 970 PHYs now better
  handled in miibus after r221812. Thanks to marius@ for piecing this
  together!

Modified:
  head/sys/dev/bm/if_bm.c

Modified: head/sys/dev/bm/if_bm.c
==============================================================================
--- head/sys/dev/bm/if_bm.c	Thu May 12 14:16:07 2011	(r221812)
+++ head/sys/dev/bm/if_bm.c	Thu May 12 14:27:28 2011	(r221813)
@@ -1130,21 +1130,11 @@ bm_chip_setup(struct bm_softc *sc)
 {
 	uint16_t reg;
 	uint16_t *eaddr_sect;
-	struct mii_data *mii;
-	struct mii_softc *miisc;
 
 	eaddr_sect = (uint16_t *)(sc->sc_enaddr);
 	dbdma_stop(sc->sc_txdma);
 	dbdma_stop(sc->sc_rxdma);
 
-	/* Reset MII */
-	mii = device_get_softc(sc->sc_miibus);
-	LIST_FOREACH(miisc, &mii->mii_phys, mii_list) {
-		PHY_RESET(miisc);
-		PHY_WRITE(miisc, MII_BMCR, PHY_READ(miisc, MII_BMCR) &
-		    ~BMCR_ISO);
-	}
-
 	/* Reset chip */
 	CSR_WRITE_2(sc, BM_RX_RESET, 0x0000);
 	CSR_WRITE_2(sc, BM_TX_RESET, 0x0001);