diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-02 15:37:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-02 15:37:34 -0400 |
| commit | 204162296edf0d0ac3e4dfd5bd0cac4af731b583 (patch) | |
| tree | fdf941fd23fae6097500db4998d4ca96467fc352 /drivers/net/wireless/iwlwifi/mvm/scan.c | |
| parent | e3d5291436ff9efeeb968459724af5332305dded (diff) | |
| parent | 147fc9be81d10e6e863323c0b54e140b42fd1ed6 (diff) | |
| download | talos-obmc-linux-204162296edf0d0ac3e4dfd5bd0cac4af731b583.tar.gz talos-obmc-linux-204162296edf0d0ac3e4dfd5bd0cac4af731b583.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 268f027b45b0..14c1b457ca50 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -308,10 +308,12 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm, */ if (req->n_ssids > 0) { cmd->passive2active = cpu_to_le16(1); + cmd->scan_flags |= SCAN_FLAGS_PASSIVE2ACTIVE; ssid = req->ssids[0].ssid; ssid_len = req->ssids[0].ssid_len; } else { cmd->passive2active = 0; + cmd->scan_flags &= ~SCAN_FLAGS_PASSIVE2ACTIVE; } iwl_mvm_scan_fill_ssids(cmd, req); |
