From owner-p4-projects@FreeBSD.ORG Tue May 1 09:16:47 2007 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 671B516A403; Tue, 1 May 2007 09:16:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 307A816A401 for ; Tue, 1 May 2007 09:16:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1812A13C448 for ; Tue, 1 May 2007 09:16:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l419Gkxv016262 for ; Tue, 1 May 2007 09:16:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l419GkiQ016259 for perforce@freebsd.org; Tue, 1 May 2007 09:16:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 1 May 2007 09:16:46 GMT Message-Id: <200705010916.l419GkiQ016259@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 119059 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: Tue, 01 May 2007 09:16:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=119059 Change 119059 by hselasky@hselasky_mini_itx on 2007/05/01 09:16:22 Remove IFF_DRV_OACTIVE from all ethernet drivers. This bit is already handled by the new USB stack. See the USBD_DEV_TRANSFERRING flag. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#23 (text+ko) ==== @@ -1202,14 +1202,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer of %d bytes complete\n", xfer->actlen); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -1271,8 +1269,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - done: return; } @@ -1404,7 +1400,6 @@ aue_cfg_pre_stop(sc, cc, 0); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= AUE_FLAG_HL_READY; return; @@ -1621,8 +1616,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(AUE_FLAG_HL_READY| ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#22 (text+ko) ==== @@ -1215,14 +1215,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer complete\n"); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -1300,7 +1298,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; done: return; } @@ -1392,7 +1389,6 @@ axe_cfg_pre_stop(sc, cc, 0); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= AXE_FLAG_HL_READY; return; @@ -1576,8 +1572,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(AXE_FLAG_HL_READY| ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#15 (text+ko) ==== @@ -507,14 +507,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer complete\n"); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -559,8 +557,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - done: return; } @@ -595,8 +591,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(CDCE_FLAG_HL_READY| @@ -677,7 +672,6 @@ cdce_stop(sc); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= (CDCE_FLAG_READ_STALL| CDCE_FLAG_WRITE_STALL| ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#18 (text+ko) ==== @@ -810,14 +810,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer complete\n"); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -858,7 +856,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; done: return; } @@ -888,7 +885,6 @@ cue_cfg_pre_stop(sc, cc, 0); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= CUE_FLAG_HL_READY; @@ -1024,8 +1020,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(CUE_FLAG_HL_READY| ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#20 (text+ko) ==== @@ -796,14 +796,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer complete\n"); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -850,7 +848,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; done: return; } @@ -909,7 +906,6 @@ kue_cfg_pre_stop(sc, cc, 0); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= KUE_FLAG_HL_READY; @@ -1043,8 +1039,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(KUE_FLAG_HL_READY| ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#19 (text+ko) ==== @@ -1082,14 +1082,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer complete\n"); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -1141,8 +1139,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - done: return; } @@ -1235,7 +1231,6 @@ rue_cfg_pre_stop(sc, cc, 0); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= RUE_FLAG_HL_READY; @@ -1446,8 +1441,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(RUE_FLAG_HL_READY| ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#19 (text+ko) ==== @@ -655,7 +655,6 @@ udav_cfg_pre_stop(sc, cc, 0); ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->sc_flags |= UDAV_FLAG_HL_READY; @@ -904,14 +903,12 @@ } ifp->if_oerrors++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; tr_transferred: DPRINTF(sc, 10, "transfer complete\n"); ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; tr_setup: @@ -974,8 +971,6 @@ usbd_start_hardware(xfer); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - done: return; } @@ -1237,8 +1232,7 @@ if (ifp) { /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(UDAV_FLAG_HL_READY| ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#10 (text+ko) ==== @@ -2733,7 +2733,6 @@ zyd_cfg_pre_stop(sc, cc, 0); - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_flags |= ZYD_FLAG_HL_READY; @@ -2815,8 +2814,7 @@ ieee80211_new_state(ic, IEEE80211_S_INIT, -1); /* clear flags */ - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | - IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } sc->sc_flags &= ~(ZYD_FLAG_HL_READY|