Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 7dd363dd3ad314b82e03878f6f6cf60836de7709,3c2c9b99b59e3ac2060317ce3008410fe6cfd544..72e3146625f8f61f7c4c8f98111a7b980546eab4
--- 1/drivers/net/wireless/iwlwifi/mvm/mac80211.c
--- 2/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);

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

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