From owner-p4-projects@FreeBSD.ORG Wed May 16 23:15:33 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 BEB3316A406; Wed, 16 May 2007 23:15:33 +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 9545016A402 for ; Wed, 16 May 2007 23:15:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 86E2713C458 for ; Wed, 16 May 2007 23:15:33 +0000 (UTC) (envelope-from imp@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 l4GNFX2J062756 for ; Wed, 16 May 2007 23:15:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GNFXVa062749 for perforce@freebsd.org; Wed, 16 May 2007 23:15:33 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:15:33 GMT Message-Id: <200705162315.l4GNFXVa062749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119942 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, 16 May 2007 23:15:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=119942 Change 119942 by imp@imp_lighthouse on 2007/05/16 23:15:15 Revert. Affected files ... .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#27 edit Differences ... ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#27 (text+ko) ==== @@ -653,7 +653,6 @@ __func__, ifp->if_flags); ath_stop(ifp); - printf("bpfdetach\n"); bpfdetach(ifp); /* * NB: the order of these is important: @@ -667,23 +666,17 @@ * it last * Other than that, it's straightforward... */ - printf("ieee80211_ifdetach\n"); ieee80211_ifdetach(&sc->sc_ic); #ifdef ATH_TX99_DIAG if (sc->sc_tx99 != NULL) sc->sc_tx99->detach(sc->sc_tx99); #endif taskqueue_free(sc->sc_tq); -printf("ath_rate_detach\n"); ath_rate_detach(sc->sc_rc); -printf("ath_desc_free\n"); ath_desc_free(sc); -printf("ath_tx_cleanup\n"); ath_tx_cleanup(sc); -printf("ath_hal_detach\n"); ath_hal_detach(sc->sc_ah); if_free(ifp); - printf("ath_Detach returns\n"); return 0; } @@ -1053,7 +1046,6 @@ if (sc->sc_tx99 != NULL) sc->sc_tx99->stop(sc->sc_tx99); #endif - printf("b4 new_state\n"); ieee80211_new_state(ic, IEEE80211_S_INIT, -1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ifp->if_timer = 0; @@ -1064,10 +1056,8 @@ !sc->sc_ledon); sc->sc_blinking = 0; } - printf("hal_intrset\n"); ath_hal_intrset(ah, 0); } - printf("ath_draintxq\n"); ath_draintxq(sc); if (!sc->sc_invalid) { ath_stoprecv(sc); @@ -1075,10 +1065,8 @@ } else sc->sc_rxlink = NULL; IFQ_DRV_PURGE(&ifp->if_snd); - printf("ath_beacon_free\n"); ath_beacon_free(sc); } - printf("ath_stop returns\n"); } static void @@ -2297,7 +2285,6 @@ struct ath_buf *bf; STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) { - printf("feeing bf %p\n", bf); if (bf->bf_m != NULL) { bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); @@ -3339,11 +3326,9 @@ ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq) { - printf("Releasing..."); -/* ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); */ + ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); ATH_TXQ_LOCK_DESTROY(txq); sc->sc_txqsetup &= ~(1<axq_qnum); - printf("done"); } /* @@ -3355,12 +3340,9 @@ int i; ATH_TXBUF_LOCK_DESTROY(sc); - for (i = 0; i < HAL_NUM_TX_QUEUES; i++) { - printf("%d: ", i); + for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i)) ath_tx_cleanupq(sc, &sc->sc_txq[i]); - printf("\n"); - } ATH_TXQ_LOCK_DESTROY(&sc->sc_mcastq); }