diff options
| author |   Xinming Hu <huxm@marvell.com> | 2018-05-29 09:42:09 +0800 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2018-05-29 10:27:01 +0300 |
| commit | db69f4e05bd5c83ea66b156fddd7cfc562092bbc (patch) | |
| tree | b749db3ad1bf6d7f282f9da47dd8454c45ac0403 /drivers/net/wireless | |
| parent | mwifiex: increase log level for internal scan fail result (diff) | |
| download | linux-dev-db69f4e05bd5c83ea66b156fddd7cfc562092bbc.tar.xz linux-dev-db69f4e05bd5c83ea66b156fddd7cfc562092bbc.zip | |
mwifiex: reserve passive scan time for radar channel
Active scan is not allowed on radar channel, instead
using passvie scan with more time.
Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/scan.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index 19df92b6668d..895b806cdb03 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -482,7 +482,8 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv, scan_chan_list[chan_idx].max_scan_time = cpu_to_le16((u16) user_scan_in-> chan_list[0].scan_time); - else if (ch->flags & IEEE80211_CHAN_NO_IR) + else if ((ch->flags & IEEE80211_CHAN_NO_IR) || + (ch->flags & IEEE80211_CHAN_RADAR)) scan_chan_list[chan_idx].max_scan_time = cpu_to_le16(adapter->passive_scan_time); else @@ -502,10 +503,12 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv, scan_chan_list[chan_idx].chan_scan_mode_bitmap |= MWIFIEX_DISABLE_CHAN_FILT; - if (filtered_scan) { + if (filtered_scan && + !((ch->flags & IEEE80211_CHAN_NO_IR) || + (ch->flags & IEEE80211_CHAN_RADAR))) scan_chan_list[chan_idx].max_scan_time = cpu_to_le16(adapter->specific_scan_time); - } + chan_idx++; } |