From owner-p4-projects@FreeBSD.ORG Wed Mar 30 22:25:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 480B216A4D0; Wed, 30 Mar 2005 22:25:28 +0000 (GMT) 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 235F916A4CE for ; Wed, 30 Mar 2005 22:25:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3F0143D31 for ; Wed, 30 Mar 2005 22:25:27 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2UMPRF8071287 for ; Wed, 30 Mar 2005 22:25:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2UMPRXs071284 for perforce@freebsd.org; Wed, 30 Mar 2005 22:25:27 GMT (envelope-from sam@freebsd.org) Date: Wed, 30 Mar 2005 22:25:27 GMT Message-Id: <200503302225.j2UMPRXs071284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 74131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2005 22:25:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=74131 Change 74131 by sam@sam_ebb on 2005/03/30 22:24:35 IFC Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#80 integrate .. //depot/projects/wifi/tools/tools/ath/athstats.c#8 integrate Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#80 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.83 2005/03/30 20:17:18 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.85 2005/03/30 20:30:48 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -3856,14 +3856,14 @@ (caddr_t)bf->bf_daddr, bf->bf_desc, txq->axq_depth); } txq->axq_link = &bf->bf_desc[bf->bf_nseg - 1].ds_link; - ATH_TXQ_UNLOCK(txq); - /* * The CAB queue is started from the SWBA handler since * frames only go out on DTIM and to avoid possible races. */ if (txq != sc->sc_cabq) ath_hal_txstart(ah, txq->axq_qnum); + ATH_TXQ_UNLOCK(txq); + return 0; #undef updateCTSForBursting #undef CTS_DURATION ==== //depot/projects/wifi/tools/tools/ath/athstats.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.5 2004/12/08 17:42:53 sam Exp $ + * $FreeBSD: src/tools/tools/ath/athstats.c,v 1.6 2005/03/30 20:21:44 sam Exp $ */ /* @@ -126,6 +126,8 @@ STAT(tx_shortpre, "tx frames with short preamble"); STAT(tx_altrate, "tx frames with an alternate rate"); STAT(tx_protect, "tx frames with 11g protection"); + STAT(tx_ctsburst, "tx frames with 11g protection and bursting"); + STAT(tx_ctsext, "tx frames with 11g cts protection extended for bursting"); STAT(ff_txok, "tx fast frames successful"); STAT(ff_txerr, "tx fast frames with error"); STAT(ff_flush, "frames flushed from fast frame staging queue");