svn commit: r210260 - head/sys/dev/bce

Pyun YongHyeon yongari at FreeBSD.org
Mon Jul 19 21:32:48 UTC 2010


Author: yongari
Date: Mon Jul 19 21:32:47 2010
New Revision: 210260
URL: http://svn.freebsd.org/changeset/base/210260

Log:
  Don't change current media in bce_stop(). There is no need to do
  this here.
  
  Reviewed by:	davidch

Modified:
  head/sys/dev/bce/if_bce.c

Modified: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c	Mon Jul 19 21:25:05 2010	(r210259)
+++ head/sys/dev/bce/if_bce.c	Mon Jul 19 21:32:47 2010	(r210260)
@@ -4577,9 +4577,6 @@ static void
 bce_stop(struct bce_softc *sc)
 {
 	struct ifnet *ifp;
-	struct ifmedia_entry *ifm;
-	struct mii_data *mii = NULL;
-	int mtmp, itmp;
 
 	DBENTER(BCE_VERBOSE_RESET);
 
@@ -4587,8 +4584,6 @@ bce_stop(struct bce_softc *sc)
 
 	ifp = sc->bce_ifp;
 
-	mii = device_get_softc(sc->bce_miibus);
-
 	callout_stop(&sc->bce_tick_callout);
 
 	/* Disable the transmit/receive blocks. */
@@ -4607,25 +4602,6 @@ bce_stop(struct bce_softc *sc)
 	/* Free TX buffers. */
 	bce_free_tx_chain(sc);
 
-	/*
-	 * Isolate/power down the PHY, but leave the media selection
-	 * unchanged so that things will be put back to normal when
-	 * we bring the interface back up.
-	 */
-
-	itmp = ifp->if_flags;
-	ifp->if_flags |= IFF_UP;
-
-	/* If we are called from bce_detach(), mii is already NULL. */
-	if (mii != NULL) {
-		ifm = mii->mii_media.ifm_cur;
-		mtmp = ifm->ifm_media;
-		ifm->ifm_media = IFM_ETHER | IFM_NONE;
-		mii_mediachg(mii);
-		ifm->ifm_media = mtmp;
-	}
-
-	ifp->if_flags = itmp;
 	sc->watchdog_timer = 0;
 
 	sc->bce_link_up = FALSE;


More information about the svn-src-all mailing list