Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db69f4e0 authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

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: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 788f4e4c

drivers/net/wireless/marvell/mwifiex/scan.c

+6 −3
Original line number Diff line number Diff line
@@ -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++;

		}