diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-04 15:14:34 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-04 15:14:34 -0500 |
| commit | 235c0dc55aa52157bbaf2917e0a4bd8ae965c43a (patch) | |
| tree | e45e7384caef706709d2270337c4dcb0d03eb69a /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | 53d8ab29f8f6d67e37857b68189b38fa3d87dd8e (diff) | |
| parent | c512865446e6dd5b6e91e81187e75b734ad7cfc7 (diff) | |
| download | kernel_replicant_linux-235c0dc55aa52157bbaf2917e0a4bd8ae965c43a.tar.gz kernel_replicant_linux-235c0dc55aa52157bbaf2917e0a4bd8ae965c43a.tar.bz2 kernel_replicant_linux-235c0dc55aa52157bbaf2917e0a4bd8ae965c43a.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
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 c49b5073c251..6bf9766e5982 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -246,7 +246,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) else hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; - if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) { + if (0 && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) { hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; |