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

Commit 50a66d7f authored May 27, 2011 by Luciano Coelho Committed by John W. Linville May 31, 2011

wl12xx: add separate config value for DFS dwell time on sched scan



Use a different value for DFS dwell time when performing a scheduled
scan.  Previously we were using the same value as for normal passive
scans.  This adds some flexibility between these two different types
of passive scan.

For now we use 150 TUs for DFS channel dwell time.  This may need to
be fine-tuned in the future.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 2497a246

drivers/net/wireless/wl12xx/conf.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1157,6 +1157,9 @@ struct conf_sched_scan_settings {
		/* time to wait on the channel for passive scans (in TUs) */
		u32 dwell_time_passive;

		/* time to wait on the channel for DFS scans (in TUs) */
		u32 dwell_time_dfs;

		/* number of probe requests to send on each channel in active scans */
		u8 num_probe_reqs;

drivers/net/wireless/wl12xx/main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -311,6 +311,7 @@ static struct conf_drv_settings default_conf = {
		.min_dwell_time_active = 8,
		.max_dwell_time_active = 30,
		.dwell_time_passive = 100,
		.dwell_time_dfs = 150,
		.num_probe_reqs = 2,
		.rssi_threshold = -90,
		.snr_threshold = 0,

drivers/net/wireless/wl12xx/scan.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -352,9 +352,12 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
		wl1271_debug(DEBUG_SCAN, "max_power %d",
		req->channels[i]->max_power);

		if (flags & IEEE80211_CHAN_RADAR)
		if (flags & IEEE80211_CHAN_RADAR) {
		channels[j].flags \|= SCAN_CHANNEL_FLAGS_DFS;
		if (flags & IEEE80211_CHAN_PASSIVE_SCAN) {
		channels[j].passive_duration =
		cpu_to_le16(c->dwell_time_dfs);
		}
		else if (flags & IEEE80211_CHAN_PASSIVE_SCAN) {
		channels[j].passive_duration =
		cpu_to_le16(c->dwell_time_passive);
		} else {