1 files changed, 15 insertions, 17 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 56df249b215e..479074303bd7 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -22,7 +22,7 @@
  * USA
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
+ * in the file called COPYING.
  *
  * Contact Information:
  *  Intel Linux Wireless <ilw@linux.intel.com>
@@ -205,7 +205,7 @@ static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm,
         rate_plcp = iwl_mvm_mac80211_idx_to_hwrate(rate_idx);
 
         mvm->mgmt_last_antenna_idx =
-                iwl_mvm_next_antenna(mvm, mvm->nvm_data->valid_tx_ant,
+                iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw),
                                      mvm->mgmt_last_antenna_idx);
         rate_flags = BIT(mvm->mgmt_last_antenna_idx) << RATE_MCS_ANT_POS;
 
@@ -365,7 +365,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
         if (WARN_ON_ONCE(!mvmsta))
                 return -1;
 
-        if (WARN_ON_ONCE(mvmsta->sta_id == IWL_INVALID_STATION))
+        if (WARN_ON_ONCE(mvmsta->sta_id == IWL_MVM_STATION_COUNT))
                 return -1;
 
         dev_cmd = iwl_mvm_set_tx_params(mvm, skb, sta, mvmsta->sta_id);
@@ -417,7 +417,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb,
         spin_unlock(&mvmsta->lock);
 
         if (mvmsta->vif->type == NL80211_IFTYPE_AP &&
-            txq_id < IWL_FIRST_AMPDU_QUEUE)
+            txq_id < IWL_MVM_FIRST_AGG_QUEUE)
                 atomic_inc(&mvmsta->pending_frames);
 
         return 0;
@@ -606,13 +606,9 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                                              info);
 
                 /* Single frame failure in an AMPDU queue => send BAR */
-                if (txq_id >= IWL_FIRST_AMPDU_QUEUE &&
-                    !(info->flags & IEEE80211_TX_STAT_ACK)) {
-                        /* there must be only one skb in the skb_list */
-                        WARN_ON_ONCE(skb_freed > 1 ||
-                                     !skb_queue_empty(&skbs));
+                if (txq_id >= IWL_MVM_FIRST_AGG_QUEUE &&
+                    !(info->flags & IEEE80211_TX_STAT_ACK))
                         info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
-                }
 
                 /* W/A FW bug: seq_ctl is wrong when the queue is flushed */
                 if (status == TX_STATUS_FAIL_FIFO_FLUSHED) {
@@ -623,7 +619,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
                 ieee80211_tx_status_ni(mvm->hw, skb);
         }
 
-        if (txq_id >= IWL_FIRST_AMPDU_QUEUE) {
+        if (txq_id >= IWL_MVM_FIRST_AGG_QUEUE) {
                 /* If this is an aggregation queue, we use the ssn since:
                  * ssn = wifi seq_num % 256.
                  * The seq_ctl is the sequence control of the packet to which
@@ -645,10 +641,12 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
         }
 
         IWL_DEBUG_TX_REPLY(mvm,
-                           "TXQ %d status %s (0x%08x)\n\t\t\t\tinitial_rate 0x%x "
-                            "retries %d, idx=%d ssn=%d next_reclaimed=0x%x seq_ctl=0x%x\n",
-                           txq_id, iwl_mvm_get_tx_fail_reason(status),
-                           status, le32_to_cpu(tx_resp->initial_rate),
+                           "TXQ %d status %s (0x%08x)\n",
+                           txq_id, iwl_mvm_get_tx_fail_reason(status), status);
+
+        IWL_DEBUG_TX_REPLY(mvm,
+                           "\t\t\t\tinitial_rate 0x%x retries %d, idx=%d ssn=%d next_reclaimed=0x%x seq_ctl=0x%x\n",
+                           le32_to_cpu(tx_resp->initial_rate),
                            tx_resp->failure_frame, SEQ_TO_INDEX(sequence),
                            ssn, next_reclaimed, seq_ctl);
 
@@ -685,7 +683,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,
          * If there are no pending frames for this STA, notify mac80211 that
          * this station can go to sleep in its STA table.
          */
-        if (txq_id < IWL_FIRST_AMPDU_QUEUE && mvmsta &&
+        if (txq_id < IWL_MVM_FIRST_AGG_QUEUE && mvmsta &&
             !WARN_ON(skb_freed > 1) &&
             mvmsta->vif->type == NL80211_IFTYPE_AP &&
             atomic_sub_and_test(skb_freed, &mvmsta->pending_frames)) {
@@ -754,7 +752,7 @@ static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm,
         u16 sequence = le16_to_cpu(pkt->hdr.sequence);
         struct ieee80211_sta *sta;
 
-        if (WARN_ON_ONCE(SEQ_TO_QUEUE(sequence) < IWL_FIRST_AMPDU_QUEUE))
+        if (WARN_ON_ONCE(SEQ_TO_QUEUE(sequence) < IWL_MVM_FIRST_AGG_QUEUE))
                 return;
 
         if (WARN_ON_ONCE(tid == IWL_TID_NON_QOS))