carl9170 firmware: allow fallback to non-aggregation xmit

[carl9170fw.git] / carlfw / src / wlan.c

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 6278b58486e570aa6570fb4e20ccd251c56f264c..3661871e342e908cc001405a1660b9793e9c01d0 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -198,6 +198,7 @@ static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super)
 
                /* update MAC flags */
                super->f.hdr.mac.erp_prot = super->s.ri[super->s.rix].erp_prot;
+               super->f.hdr.mac.ampdu = super->s.ri[super->s.rix].ampdu;
 
                /* reinitialize try counter */
                super->s.cnt = 1;
@@ -290,7 +291,7 @@ static bool wlan_tx_status(struct dma_queue *queue,
 
        success = true;
 
-       if (!!(desc->ctrl & AR9170_CTRL_FAIL_MASK)) {
+       if (!!(desc->ctrl & AR9170_CTRL_FAIL)) {
                txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL);
 
                /* reset retry indicator flags */