PERFORCE change 74131 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=74131

Change 74131 by sam at 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 <sys/cdefs.h>
-__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");