From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Jun 2014 19:29:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif... 
X-Git-Tag: firefly_0821_release~176^2~3474^2~12^2~179^2~54
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f4ef7197db98a40e43904806612a8ccf609c0a3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
---

5f4ef7197db98a40e43904806612a8ccf609c0a3
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 7dd363dd3ad3,3c2c9b99b59e..72e3146625f8
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -1537,13 -1549,13 +1549,14 @@@ static void iwl_mvm_bss_info_changed(st
  
  static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
  			       struct ieee80211_vif *vif,
 -			       struct cfg80211_scan_request *req)
 +			       struct ieee80211_scan_request *hw_req)
  {
  	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
 +	struct cfg80211_scan_request *req = &hw_req->req;
  	int ret;
  
- 	if (req->n_channels == 0 || req->n_channels > MAX_NUM_SCAN_CHANNELS)
+ 	if (req->n_channels == 0 ||
+ 	    req->n_channels > mvm->fw->ucode_capa.n_scan_channels)
  		return -EINVAL;
  
  	mutex_lock(&mvm->mutex);