diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-03-16 02:51:47 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-03-16 02:51:47 -0400 |
commit | 833df4a81d06830bd4d24ad26b76656f62d5fac1 (patch) | |
tree | f0259a868f2f84fa95523103f746fe0cb38968bc /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
parent | b797e3fbab399ed023bdaeaf7fb63236f67eaa1c (diff) |
iwlwifi: mvm: fix merge damage
Scheduled scan was disabled because it was broken. Now it is
fixed and got disabled by mistake by a merge.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index a6df00d675b7..de0e0df52314 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -365,7 +365,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) | |||
365 | else | 365 | else |
366 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; | 366 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; |
367 | 367 | ||
368 | if (0 && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) { | 368 | if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) { |
369 | hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; | 369 | hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; |
370 | hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; | 370 | hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; |
371 | hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; | 371 | hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; |