svn commit: r197585 - head/sys/dev/jme

[Pyun YongHyeon]

Author: yongari
Date: Mon Sep 28 19:33:52 2009
New Revision: 197585
URL: http://svn.freebsd.org/changeset/base/197585

Log:
  Remove unnecessary device reinitialization.

Modified:
  head/sys/dev/jme/if_jme.c

Modified: head/sys/dev/jme/if_jme.c
==============================================================================
--- head/sys/dev/jme/if_jme.c   Mon Sep 28 18:55:29 2009        (r197584)
+++ head/sys/dev/jme/if_jme.c   Mon Sep 28 19:33:52 2009        (r197585)
@@ -306,6 +306,10 @@ jme_mediastatus(struct ifnet *ifp, struc
 
        sc = ifp->if_softc;
        JME_LOCK(sc);
+       if ((ifp->if_flags & IFF_UP) == 0) {
+               JME_UNLOCK(sc);
+               return;
+       }
        mii = device_get_softc(sc->jme_miibus);
 
        mii_pollstat(mii);
@@ -1585,8 +1589,10 @@ jme_resume(device_t dev)
                    pmc + PCIR_POWER_STATUS, pmstat, 2);
        }
        ifp = sc->jme_ifp;
-       if ((ifp->if_flags & IFF_UP) != 0)
+       if ((ifp->if_flags & IFF_UP) != 0) {
+               ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                jme_init_locked(sc);
+       }
 
        JME_UNLOCK(sc);
 
@@ -1861,6 +1867,7 @@ jme_watchdog(struct jme_softc *sc)
        if ((sc->jme_flags & JME_FLAG_LINK) == 0) {
                if_printf(sc->jme_ifp, "watchdog timeout (missed link)\n");
                ifp->if_oerrors++;
+               ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                jme_init_locked(sc);
                return;
        }
@@ -1875,6 +1882,7 @@ jme_watchdog(struct jme_softc *sc)
 
        if_printf(sc->jme_ifp, "watchdog timeout\n");
        ifp->if_oerrors++;
+       ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
        jme_init_locked(sc);
        if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
                taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task);
@@ -1917,8 +1925,10 @@ jme_ioctl(struct ifnet *ifp, u_long cmd,
                                VLAN_CAPABILITIES(ifp);
                        }
                        ifp->if_mtu = ifr->ifr_mtu;
-                       if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+                       if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
+                               ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                                jme_init_locked(sc);
+                       }
                        JME_UNLOCK(sc);
                }
                break;
@@ -2642,6 +2652,8 @@ jme_init_locked(struct jme_softc *sc)
        ifp = sc->jme_ifp;
        mii = device_get_softc(sc->jme_miibus);
 
+       if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+               return;
        /*
         * Cancel any pending I/O.
         */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"