|
@@ -1127,12 +1127,16 @@ int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
|
|
|
q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd)) {
|
|
|
|
|
|
tx_info = &txq->txb[txq->q.read_ptr];
|
|
|
- iwl4965_tx_status(priv, tx_info,
|
|
|
- txq_id >= IWL4965_FIRST_AMPDU_QUEUE);
|
|
|
+
|
|
|
+ if (WARN_ON_ONCE(tx_info->skb == NULL))
|
|
|
+ continue;
|
|
|
|
|
|
hdr = (struct ieee80211_hdr *)tx_info->skb->data;
|
|
|
- if (hdr && ieee80211_is_data_qos(hdr->frame_control))
|
|
|
+ if (ieee80211_is_data_qos(hdr->frame_control))
|
|
|
nfreed++;
|
|
|
+
|
|
|
+ iwl4965_tx_status(priv, tx_info,
|
|
|
+ txq_id >= IWL4965_FIRST_AMPDU_QUEUE);
|
|
|
tx_info->skb = NULL;
|
|
|
|
|
|
priv->cfg->ops->lib->txq_free_tfd(priv, txq);
|