Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 17:59:35 +0000 (13:59 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Mar 2015 17:59:35 +0000 (13:59 -0400)
1  2 
drivers/net/wireless/iwlwifi/mvm/coex.c
drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
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),