Merge branch 'iwlwifi-fixes' into iwlwifi-next

diff --cc drivers/net/wireless/iwlwifi/mvm/coex.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
index f0946b5dd7c88b2b833d59a60c0dd753e8399352,c47c8051da7770f2a2a89c9b33868151c62f0ff6..a75bb150ea275ef18fd6449e8c1d5543fc466bf6
--- 1/drivers/net/wireless/iwlwifi/mvm/scan.c
--- 2/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@@ -587,9 -1128,18 +587,11 @@@ int iwl_mvm_scan_offload_stop(struct iw
        if (mvm->scan_status == IWL_MVM_SCAN_NONE)
                return 0;
  
-       if (iwl_mvm_is_radio_killed(mvm))
+       if (iwl_mvm_is_radio_killed(mvm)) {
+               ret = 0;
                goto out;
+       }
  
 -      if (mvm->scan_status != IWL_MVM_SCAN_SCHED &&
 -          (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) ||
 -           mvm->scan_status != IWL_MVM_SCAN_OS)) {
 -              IWL_DEBUG_SCAN(mvm, "No scan to stop\n");
 -              return 0;
 -      }
 -
        iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_done,
                                   scan_done_notif,
                                   ARRAY_SIZE(scan_done_notif),

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
Simple merge