--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -484,7 +484,7 @@ static void ath_tx_complete_aggr(struct 
 				 */
 				txfail = 1;
 			} else if (fi->retries < ATH_MAX_SW_RETRIES) {
-				if (!(ts->ts_status & ATH9K_TXERR_FILT) ||
+				if (!(ts->ts_status & ATH9K_TXERR_FILT) &&
 				    !an->sleeping)
 					ath_tx_set_retry(sc, txq, bf->bf_mpdu,
 							 retries);