iwlwifi: mvm: Don't warn on command failure during restart

When HW restart is requested but not started yet, commands would not
be sent to the FW, and some function calls return an error. Such cases
can trigger unneeded warning messages, e.g., in iwl_mvm_mac_sta_state()
and iwl_mvm_bss_info_changed_station().

Handle a couple of these cases by also checking in the WARN_ON()
condition that HW restart is not requested.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index c02559766712..313de9de02fc 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -2364,7 +2364,10 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
                          * If update fails - SF might be running in associated
                          * mode while disassociated - which is forbidden.
                          */
-                        WARN_ONCE(iwl_mvm_sf_update(mvm, vif, false),
+                        ret = iwl_mvm_sf_update(mvm, vif, false);
+                        WARN_ONCE(ret &&
+                                  !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
+                                            &mvm->status),
                                   "Failed to update SF upon disassociation\n");
 
                         /*
@@ -3169,7 +3172,10 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
         } else if (old_state == IEEE80211_STA_AUTHORIZED &&
                    new_state == IEEE80211_STA_ASSOC) {
                 /* disable beacon filtering */
-                WARN_ON(iwl_mvm_disable_beacon_filter(mvm, vif, 0));
+                ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
+                WARN_ON(ret &&
+                        !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
+                                  &mvm->status));
                 ret = 0;
         } else if (old_state == IEEE80211_STA_ASSOC &&
                    new_state == IEEE80211_STA_AUTH) {