diff options
| author | Eliad Peller <eliad@wizery.com> | 2013-09-09 12:24:43 +0300 |
|---|---|---|
| committer | Luciano Coelho <luciano.coelho@intel.com> | 2013-10-23 09:47:44 +0300 |
| commit | e9687ea9caaf9f961df8144a95ca63ec77c02b49 (patch) | |
| tree | 585f51e22d1d20ccc7e559235cb64b350ce51e83 | |
| parent | 2473ec8f909d8c46e52e13f6fc3215c9c08400c8 (diff) | |
| download | linux-e9687ea9caaf9f961df8144a95ca63ec77c02b49.tar.gz linux-e9687ea9caaf9f961df8144a95ca63ec77c02b49.tar.bz2 linux-e9687ea9caaf9f961df8144a95ca63ec77c02b49.zip | |
wlcore: fix started_vifs calculation
wlcore configures different dwell times according to number
of active interfaces (in order to prevent hurting VO during
scan).
However, determining active vif only according to
bss_conf->idle is not explicit enough, and might result
in non-started vifs being counted as started as well
(e.g. unassociated sta during sta).
Fix it by checking for explicit conditions according
to the vif type.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/scan.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c index 13e743df2e31..7ed86203304b 100644 --- a/drivers/net/wireless/ti/wlcore/scan.c +++ b/drivers/net/wireless/ti/wlcore/scan.c @@ -92,9 +92,31 @@ out: static void wlcore_started_vifs_iter(void *data, u8 *mac, struct ieee80211_vif *vif) { + struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif); + bool active = false; int *count = (int *)data; - if (!vif->bss_conf.idle) + /* + * count active interfaces according to interface type. + * checking only bss_conf.idle is bad for some cases, e.g. + * we don't want to count sta in p2p_find as active interface. + */ + switch (wlvif->bss_type) { + case BSS_TYPE_STA_BSS: + if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) + active = true; + break; + + case BSS_TYPE_AP_BSS: + if (wlvif->wl->active_sta_count > 0) + active = true; + break; + + default: + break; + } + + if (active) (*count)++; } |