wifi: iwlwifi: mvm: move BA notif messages before action

This is always a bit confusing, the code first does all the
reclaim (with its own debug messages), and _then_ prints it
got a BA notification from firmware. Turn that around.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240206175739.825245e0803f.Ic607c57f43eb7c7ff122ffee8f3994fd040d578f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index cc73d7d7de7d012cf2af159e4babee67f602d1c0..4981bb1f02512f1bce7e7a985615fbc5466ed445 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -2162,6 +2162,12 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
                                 tfd_cnt, pkt_len))
                        return;
 
+               IWL_DEBUG_TX_REPLY(mvm,
+                                  "BA_NOTIFICATION Received from sta_id = %d, flags %x, sent:%d, acked:%d\n",
+                                  sta_id, le32_to_cpu(ba_res->flags),
+                                  le16_to_cpu(ba_res->txed),
+                                  le16_to_cpu(ba_res->done));
+
                rcu_read_lock();
 
                mvmsta = iwl_mvm_sta_from_staid_rcu(mvm, sta_id);
@@ -2197,12 +2203,6 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
                        iwl_mvm_tx_airtime(mvm, mvmsta,
                                           le32_to_cpu(ba_res->wireless_time));
                rcu_read_unlock();
-
-               IWL_DEBUG_TX_REPLY(mvm,
-                                  "BA_NOTIFICATION Received from sta_id = %d, flags %x, sent:%d, acked:%d\n",
-                                  sta_id, le32_to_cpu(ba_res->flags),
-                                  le16_to_cpu(ba_res->txed),
-                                  le16_to_cpu(ba_res->done));
                return;
        }
 
@@ -2234,9 +2234,6 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
 
        rcu_read_unlock();
 
-       iwl_mvm_tx_reclaim(mvm, sta_id, tid, txq, index, &ba_info,
-                          tid_data->rate_n_flags, false);
-
        IWL_DEBUG_TX_REPLY(mvm,
                           "BA_NOTIFICATION Received from %pM, sta_id = %d\n",
                           ba_notif->sta_addr, ba_notif->sta_id);
@@ -2249,6 +2246,9 @@ void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
 
        IWL_DEBUG_TX_REPLY(mvm, "reduced txp from ba notif %d\n",
                           ba_notif->reduced_txp);
+
+       iwl_mvm_tx_reclaim(mvm, sta_id, tid, txq, index, &ba_info,
+                          tid_data->rate_n_flags, false);
 }
 
 /*