return (get_tid(a) == get_tid(b)) || same_hdr(a, b);
}
+static void wlan_tx_ampdu_reset(unsigned int qidx)
+{
+ fw.wlan.ampdu_prev[qidx] = NULL;
+}
+
static void wlan_tx_ampdu_end(unsigned int qidx)
{
struct carl9170_tx_superframe *ht_prev = fw.wlan.ampdu_prev[qidx];
- fw.wlan.ampdu_prev[qidx] = NULL;
if (ht_prev)
ht_prev->f.hdr.mac.ba_end = 1;
+
+ wlan_tx_ampdu_reset(qidx);
}
static void wlan_tx_ampdu(struct carl9170_tx_superframe *super)
unsigned int qidx = super->s.queue;
struct carl9170_tx_superframe *ht_prev = fw.wlan.ampdu_prev[qidx];
- if (!super->f.hdr.mac.ampdu) {
- wlan_tx_ampdu_end(qidx);
- } else {
- fw.wlan.ampdu_prev[qidx] = super;
-
+ if (super->f.hdr.mac.ampdu) {
if (ht_prev &&
!same_aggr(&super->f.data.i3e, &ht_prev->f.data.i3e))
ht_prev->f.hdr.mac.ba_end = 1;
else
super->f.hdr.mac.ba_end = 0;
+
+ fw.wlan.ampdu_prev[qidx] = super;
+ } else {
+ wlan_tx_ampdu_end(qidx);
}
}
wlan_tx_ampdu(super);
-#if (defined CONFIG_CARL9170FW_LOOPBACK) || (defined CONFIG_CARL9170FW_DISCARD)
- wlan_tx_complete(super, true);
- unhide_super(desc);
-# ifdef CONFIG_CARL9170FW_LOOPBACK
- dma_put(&fw.pta.up_queue, desc);
- up_trigger();
-# elif CONFIG_CARL9170FW_DISCARD
- dma_reclaim(&fw.pta.down_queue, desc);
- down_trigger();
-# endif
-#else /* CONFIG_CARL9170FW_LOOPBACK */
-
-# ifdef CONFIG_CARL9170FW_DEBUG
+#ifdef CONFIG_CARL9170FW_DEBUG
BUG_ON(fw.phy.psm.state != CARL9170_PSM_WAKE);
-# endif /* CONFIG_CARL9170FW_DEBUG */
+#endif /* CONFIG_CARL9170FW_DEBUG */
/* insert desc into the right queue */
dma_put(&fw.wlan.tx_queue[super->s.queue], desc);
-#endif /* CONFIG_CARL9170FW_LOOPBACK */
}
static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif)
get(AR9170_MAC_REG_AMPDU_FACTOR),
8 << super->s.ampdu_factor));
}
-
- __wlan_tx(desc);
}
/* propagate transmission status back to the driver */
* be aware of this so the frames don't get lost.
*/
+#ifndef CONFIG_CARL9170FW_DEBUG
dma_unlink_head(queue);
+#else /* CONFIG_CARL9170FW_DEBUG */
+ BUG_ON(dma_unlink_head(queue) != desc);
+#endif /* CONFIG_CARL9170FW_DEBUG */
dma_put(&fw.wlan.tx_retry, desc);
return true;
}
}
}
+#ifndef CONFIG_CARL9170FW_DEBUG
dma_unlink_head(queue);
+#else /* CONFIG_CARL9170FW_DEBUG */
+ BUG_ON(dma_unlink_head(queue) != desc);
+#endif /* CONFIG_CARL9170FW_DEBUG */
if (txfail) {
/*
* Issue the queue bump,
}
}
+ wlan_tx_ampdu_reset(i);
+
for_each_desc(desc, &fw.wlan.tx_retry)
__wlan_tx(desc);
#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
_wlan_tx(desc);
+ __wlan_tx(desc);
wlan_trigger(BIT(super->s.queue));
}
rx_filter |= CARL9170_RX_FILTER_MGMT;
}
-#ifdef CONFIG_CARL9170FW_WOL
if (unlikely(fw.suspend_mode == CARL9170_HOST_SUSPENDED)) {
wol_rx(rx_filter, hdr, min(data_len,
(unsigned int)AR9170_BLOCK_SIZE));
}
-#endif /* CONFIG_CARL9170FW_WOL */
#undef AR9170_RX_ERROR_BAD
/* ready to roll! */
_wlan_tx(desc);
+ __wlan_tx(desc);
wlan_trigger(BIT(super->s.queue));
}
}