svn commit: r235461 - head/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Tue May 15 04:55:15 2012
New Revision: 235461
URL: http://svn.freebsd.org/changeset/base/235461

Log:
  Handle non-xretry errors the same as xretry errors for now.
  
  Although I _should_ handle the other errors in various ways (specifically
  errors like FILT), treating them as having transmitted successfully
  is completely wrong.  Here, they'd be counted as successful and the BAW
  would be advanced.. but the RX side wouldn't have received them.
  
  The specific errors I've been seeing here are HAL_TXERR_FILT.
  
  This patch does fix the issue - I've tested it using -i 0.001 pings
  (enough to start aggregation) and now the behaviour is correct:
  
  * The RX side never sees a "moved window" error, and
  * The TX side sends BARs as needed, with the RX side correctly handling
    them.
  
  PR:		kern/167902

Modified:
  head/sys/dev/ath/if_ath_tx.c

Modified: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c	Tue May 15 03:21:36 2012	(r235460)
+++ head/sys/dev/ath/if_ath_tx.c	Tue May 15 04:55:15 2012	(r235461)
@@ -3597,9 +3597,16 @@ ath_tx_aggr_comp_aggr(struct ath_softc *
 	pktlen = bf_first->bf_state.bfs_pktlen;
 
 	/*
-	 * handle errors first
+	 * Handle errors first!
+	 *
+	 * Here, handle _any_ error as a "exceeded retries" error.
+	 * Later on (when filtered frames are to be specially handled)
+	 * it'll have to be expanded.
 	 */
+#if 0
 	if (ts.ts_status & HAL_TXERR_XRETRY) {
+#endif
+	if (ts.ts_status != 0) {
 		ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
 		ath_tx_comp_aggr_error(sc, bf_first, atid);
 		return;
@@ -3839,7 +3846,10 @@ ath_tx_aggr_comp_unaggr(struct ath_softc
 	 * Don't bother with the retry check if all frames
 	 * are being failed (eg during queue deletion.)
 	 */
+#if 0
 	if (fail == 0 && ts->ts_status & HAL_TXERR_XRETRY) {
+#endif
+	if (fail == 0 && ts->ts_status != 0) {
 		ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
 		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: retry_unaggr\n",
 		    __func__);