From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Thu, 12 Mar 2015 12:38:26 +0000 (+0200)
Subject: Merge branch 'iwlwifi-fixes' into iwlwifi-next
X-Git-Tag: firefly_0821_release~176^2~1974^2~39^2~6^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=208d271a3f5388672b3d7ec141e975abd84ab3da;p=firefly-linux-kernel-4.4.55.git

Merge branch 'iwlwifi-fixes' into iwlwifi-next
---

208d271a3f5388672b3d7ec141e975abd84ab3da
diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
index f0946b5dd7c8,c47c8051da77..a75bb150ea27
--- a/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),