svn commit: r211671 - head/sys/dev/xl

[Pyun YongHyeon]

Author: yongari
Date: Mon Aug 23 00:31:55 2010
New Revision: 211671
URL: http://svn.freebsd.org/changeset/base/211671

Log:
  Remove unnecessary controller reinitialization by checking
  IFF_DRV_RUNNING flag.

Modified:
  head/sys/dev/xl/if_xl.c

Modified: head/sys/dev/xl/if_xl.c
==============================================================================
--- head/sys/dev/xl/if_xl.c     Mon Aug 23 00:24:12 2010        (r211670)
+++ head/sys/dev/xl/if_xl.c     Mon Aug 23 00:31:55 2010        (r211671)
@@ -2247,6 +2247,7 @@ xl_intr(void *arg)
 
                if (status & XL_STAT_ADFAIL) {
                        xl_reset(sc);
+                       ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                        xl_init_locked(sc);
                }
 
@@ -2318,6 +2319,7 @@ xl_poll_locked(struct ifnet *ifp, enum p
 
                        if (status & XL_STAT_ADFAIL) {
                                xl_reset(sc);
+                               ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                                xl_init_locked(sc);
                        }
 
@@ -2745,6 +2747,8 @@ xl_init_locked(struct xl_softc *sc)
 
        XL_LOCK_ASSERT(sc);
 
+       if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+               return;
        /*
         * Cancel pending I/O and free all RX/TX buffers.
         */
@@ -2993,6 +2997,7 @@ xl_ifmedia_upd(struct ifnet *ifp)
        if (sc->xl_media & XL_MEDIAOPT_MII ||
            sc->xl_media & XL_MEDIAOPT_BTX ||
            sc->xl_media & XL_MEDIAOPT_BT4) {
+               ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                xl_init_locked(sc);
        } else {
                xl_setmode(sc, ifm->ifm_media);
@@ -3108,10 +3113,8 @@ xl_ioctl(struct ifnet *ifp, u_long comma
                                CSR_WRITE_2(sc, XL_COMMAND,
                                    XL_CMD_RX_SET_FILT|rxfilt);
                                XL_SEL_WIN(7);
-                       } else {
-                               if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
-                                       xl_init_locked(sc);
-                       }
+                       } else
+                               xl_init_locked(sc);
                } else {
                        if (ifp->if_drv_flags & IFF_DRV_RUNNING)
                                xl_stop(sc);
@@ -3234,6 +3237,7 @@ xl_watchdog(struct xl_softc *sc)
                    "no carrier - transceiver cable problem?\n");
 
        xl_reset(sc);
+       ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
        xl_init_locked(sc);
 
        if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
@@ -3364,8 +3368,10 @@ xl_resume(device_t dev)
        XL_LOCK(sc);
 
        xl_reset(sc);
-       if (ifp->if_flags & IFF_UP)
+       if (ifp->if_flags & IFF_UP) {
+               ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
                xl_init_locked(sc);
+       }
 
        XL_UNLOCK(sc);
 
_______________________________________________
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"