projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-scan.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-scan.c
b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 9bb6adb28b73dd5a1aaf4041d61d03f9f2e0200b..6c8ac3a87d547f5ca2c4ad1543ec530e180dd467 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-scan.c
@@
-421,7
+421,7
@@
static int iwl_get_channels_for_scan(struct iwl_priv *priv,
else
scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
else
scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
- if (
(scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) &&
n_probes)
+ if (n_probes)
scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes);
scan_ch->active_dwell = cpu_to_le16(active_dwell);
scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes);
scan_ch->active_dwell = cpu_to_le16(active_dwell);