From owner-p4-projects@FreeBSD.ORG Wed Aug 30 14:04:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E8DE16A4DE; Wed, 30 Aug 2006 14:04:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CE6416A4E2 for ; Wed, 30 Aug 2006 14:04:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79EB643D62 for ; Wed, 30 Aug 2006 14:04:34 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7UE4YPG079700 for ; Wed, 30 Aug 2006 14:04:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7UE4Y6U079697 for perforce@freebsd.org; Wed, 30 Aug 2006 14:04:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 30 Aug 2006 14:04:34 GMT Message-Id: <200608301404.k7UE4Y6U079697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 105328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2006 14:04:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=105328 Change 105328 by hselasky@hselasky_mini_itx on 2006/08/30 14:04:20 Make network drivers smarter by polling status before checking it, instead of after. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#7 (text+ko) ==== @@ -1339,14 +1339,14 @@ mii_tick(mii); + mii_pollstat(mii); + if ((sc->sc_flags & AUE_FLAG_WAIT_LINK) && (mii->mii_media_status & IFM_ACTIVE) && (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE)) { sc->sc_flags &= ~AUE_FLAG_WAIT_LINK; } - mii_pollstat(mii); - sc->sc_media_active = mii->mii_media_active; sc->sc_media_status = mii->mii_media_status; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#6 (text+ko) ==== @@ -1058,14 +1058,14 @@ mii_tick(mii); + mii_pollstat(mii); + if ((sc->sc_flags & AXE_FLAG_WAIT_LINK) && (mii->mii_media_status & IFM_ACTIVE) && (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE)) { sc->sc_flags &= ~AXE_FLAG_WAIT_LINK; } - mii_pollstat(mii); - sc->sc_media_active = mii->mii_media_active; sc->sc_media_status = mii->mii_media_status; @@ -1287,9 +1287,6 @@ } /* - * Stop the adapter and free any mbufs allocated to the - * RX and TX lists. - * * NOTE: can be called when "ifp" is NULL */ static void ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#5 (text+ko) ==== @@ -1195,14 +1195,14 @@ mii_tick(mii); + mii_pollstat(mii); + if ((sc->sc_flags & RUE_FLAG_WAIT_LINK) && (mii->mii_media_status & IFM_ACTIVE) && (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE)) { sc->sc_flags &= ~RUE_FLAG_WAIT_LINK; } - mii_pollstat(mii); - sc->sc_media_active = mii->mii_media_active; sc->sc_media_status = mii->mii_media_status; ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#5 (text+ko) ==== @@ -1373,14 +1373,14 @@ mii_tick(mii); + mii_pollstat(mii); + if ((sc->sc_flags & UDAV_FLAG_WAIT_LINK) && (mii->mii_media_status & IFM_ACTIVE) && (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE)) { sc->sc_flags &= ~UDAV_FLAG_WAIT_LINK; } - mii_pollstat(mii); - sc->sc_media_active = mii->mii_media_active; sc->sc_media_status = mii->mii_media_status;