iwlwifi: mvm: improve log when processing CSA

Sometimes driver fails to detect misbehaving AP since we may
miss a few beacons (AP is declared misbehaving only after the second
time CSA counter has a wrong jump).
Move the print to the start of the function to avoid doubts when
analysing this kind of issues.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211017165728.8e6b1eb8a436.I5fd6caee968007e91d03b93d6ea84b670ce047e9@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 5277f63dac3d262efdb09e279dc25a818c5f80b1..2645dd8fef83e98d12ac4acbee6e5af25a7a183c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4732,6 +4732,9 @@ static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,
        if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_CS_MODIFY))
                return;
 
+       IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d count = %d (old %d) mode = %d\n",
+                          mvmvif->id, chsw->count, mvmvif->csa_count, chsw->block_tx);
+
        if (chsw->count >= mvmvif->csa_count && chsw->block_tx) {
                if (mvmvif->csa_misbehave) {
                        /* Second time, give up on this AP*/
@@ -4748,8 +4751,6 @@ static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,
        if (mvmvif->csa_failed)
                goto out_unlock;
 
-       IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d count = %d mode = %d\n",
-                          mvmvif->id, chsw->count, chsw->block_tx);
        WARN_ON(iwl_mvm_send_cmd_pdu(mvm,
                                     WIDE_ID(MAC_CONF_GROUP,
                                             CHANNEL_SWITCH_TIME_EVENT_CMD),