diff options
| author | David Spinadel <david.spinadel@intel.com> | 2014-06-12 19:29:40 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-07 21:41:10 +0300 |
| commit | af91344c23fd23be44bc6e3dfb2c7b47bb9e6e11 (patch) | |
| tree | 2f63d1e77a9231d80ce0d5be41f5057eaf9df5c6 /drivers/net/wireless/iwlwifi | |
| parent | fb98be5e94194ba76b507770dc96f744fed8e4c5 (diff) | |
| download | linux-af91344c23fd23be44bc6e3dfb2c7b47bb9e6e11.tar.gz linux-af91344c23fd23be44bc6e3dfb2c7b47bb9e6e11.tar.bz2 linux-af91344c23fd23be44bc6e3dfb2c7b47bb9e6e11.zip | |
iwlwifi: mvm: init lmac scan command
Initialize LMAC scan command.
Fix EBS flag to be dependant on TLV flg and fix other bugs.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 919ed0e18bb0..14fc6adc963a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -1099,6 +1099,7 @@ iwl_mvm_build_generic_unified_scan_cmd(struct iwl_mvm *mvm, struct iwl_scan_req_unified_lmac *cmd, struct iwl_mvm_scan_params *params) { + memset(cmd, 0, ksize(cmd)); cmd->active_dwell = (u8)params->dwell[IEEE80211_BAND_2GHZ].active; cmd->passive_dwell = (u8)params->dwell[IEEE80211_BAND_2GHZ].passive; /* TODO: Use params; now fragmented isn't used. */ @@ -1107,14 +1108,19 @@ iwl_mvm_build_generic_unified_scan_cmd(struct iwl_mvm *mvm, cmd->max_out_time = cpu_to_le32(params->max_out_time); cmd->suspend_time = cpu_to_le32(params->suspend_time); cmd->scan_prio = cpu_to_le32(IWL_SCAN_PRIORITY_HIGH); - cmd->channel_opt[0].flags = mvm->last_ebs_successful ? - cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS & - IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE & - IWL_SCAN_CHANNEL_FLAG_CACHE_ADD) : - 0; - cmd->channel_opt[0].non_ebs_ratio = 0; cmd->iter_num = cpu_to_le32(1); - cmd->delay = 0; + + if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT && + mvm->last_ebs_successful) { + cmd->channel_opt[0].flags = + cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS | + IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE | + IWL_SCAN_CHANNEL_FLAG_CACHE_ADD); + cmd->channel_opt[1].flags = + cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS | + IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE | + IWL_SCAN_CHANNEL_FLAG_CACHE_ADD); + } } int iwl_mvm_unified_scan_lmac(struct iwl_mvm *mvm, |