From: Eyal Shapira <eyal@xxxxxxxxxx>
There's a limit on scan dwell times of max 30ms in order
to avoid degrading voip traffic which could be going on
while scanning. However these dwell times increase the
chance of missing out on nearby APs leading to partial
scan results. Allow configuration of longer dwell times
in case there no active interface (i.e. no STA associated
or AP up).
[Arik - count started vifs using an in-driver function]
Signed-off-by: Eyal Shapira <eyal@xxxxxxxxxx>
Signed-off-by: Arik Nemtsov <arik@xxxxxxxxxx>
---
drivers/net/wireless/ti/wl12xx/main.c | 6 ++++--
drivers/net/wireless/ti/wl18xx/main.c | 6 ++++--
drivers/net/wireless/ti/wlcore/conf.h | 20 +++++++++++++++++++-
drivers/net/wireless/ti/wlcore/scan.c | 29 +++++++++++++++++++++++++++--
4 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index 5e3c808..a03a847 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -267,8 +267,10 @@ static struct wlcore_conf wl12xx_conf = {
.avg_weight_snr_data = 10,
},
.scan = {
- .min_dwell_time_active = 7500,
- .max_dwell_time_active = 30000,
+ .min_dwell_time_active_conc = 7500,
+ .max_dwell_time_active_conc = 30000,
+ .min_dwell_time_active = 25000,
+ .max_dwell_time_active = 50000,
.dwell_time_passive = 100000,
.dwell_time_dfs = 150000,
.num_probe_reqs = 2,
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index d806241..9685fc3 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -394,8 +394,10 @@ static struct wlcore_conf wl18xx_conf = {
.avg_weight_snr_data = 10,
},
.scan = {
- .min_dwell_time_active = 7500,
- .max_dwell_time_active = 30000,
+ .min_dwell_time_active_conc = 7500,
+ .max_dwell_time_active_conc = 30000,
+ .min_dwell_time_active = 25000,
+ .max_dwell_time_active = 50000,
.dwell_time_passive = 100000,
.dwell_time_dfs = 150000,
.num_probe_reqs = 2,
diff --git a/drivers/net/wireless/ti/wlcore/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
index ad15cae..a4eb14c 100644
--- a/drivers/net/wireless/ti/wlcore/conf.h
+++ b/drivers/net/wireless/ti/wlcore/conf.h
@@ -1097,6 +1097,24 @@ struct conf_scan_settings {
*/
u32 max_dwell_time_active;
+ /*
+ * The minimum time to wait on each channel for active scans
+ * when there's a concurrent active interface. This should
+ * lower than min_dwell_time_active usually in order to avoid
+ * interfering with possible voip traffic on another interface.
+ *
+ * Range: u32 tu/1000
+ */
+ u32 min_dwell_time_active_conc;
+
+ /*
+ * The maximum time to wait on each channel for active scans
+ * See explanation about min_dwell_time_active_conc
+ *
+ * Range: u32 tu/1000
+ */
+ u32 max_dwell_time_active_conc;
+
/* time to wait on the channel for passive scans (in TU/1000) */
u32 dwell_time_passive;
@@ -1322,7 +1340,7 @@ struct conf_recovery_settings {
* version, the two LSB are the lower driver's private conf
* version.
*/
-#define WLCORE_CONF_VERSION (0x0005 << 16)
+#define WLCORE_CONF_VERSION (0x0006 << 16)
#define WLCORE_CONF_MASK 0xffff0000
#define WLCORE_CONF_SIZE (sizeof(struct wlcore_conf_header) + \
sizeof(struct wlcore_conf))
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index 7f42f8a..2cbd5e8 100644
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -89,6 +89,25 @@ out:
}
+static void wlcore_started_vifs_iter(void *data, u8 *mac,
+ struct ieee80211_vif *vif)
+{
+ int *count = (int *)data;
+
+ if (!vif->bss_conf.idle)
+ (*count)++;
+}
+
+static int wlcore_count_started_vifs(struct wl1271 *wl)
+{
+ int count = 0;
+
+ ieee80211_iterate_active_interfaces_atomic(wl->hw,
+ wlcore_started_vifs_iter,
+ &count);
+ return count;
+}
+
static int
wlcore_scan_get_channels(struct wl1271 *wl,
struct ieee80211_channel *req_channels[],
@@ -109,9 +128,15 @@ wlcore_scan_get_channels(struct wl1271 *wl,
/* configure dwell times according to scan type */
if (scan_type == SCAN_TYPE_SEARCH) {
struct conf_scan_settings *c = &wl->conf.scan;
+ bool active_vif_exists = !!wlcore_count_started_vifs(wl);
+
+ min_dwell_time_active = active_vif_exists ?
+ c->min_dwell_time_active_conc :
+ c->min_dwell_time_active;
+ max_dwell_time_active = active_vif_exists ?
+ c->max_dwell_time_active_conc :
+ c->max_dwell_time_active;
- min_dwell_time_active = c->min_dwell_time_active;
- max_dwell_time_active = c->max_dwell_time_active;
dwell_time_passive = c->dwell_time_passive;
dwell_time_dfs = c->dwell_time_dfs;
} else {
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
