jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow OBSS scan and 20/40 coex reports to non-SME drivers

Browse source 
We enable this feature for non-SME drivers as well if
they explicitly indicate need for it.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
This commit is contained in:
Amitkumar Karwar 2012-11-24 18:08:48 +02:00 committed by Jouni Malinen
parent 3d83a6b9b6
commit 368b1957a6
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/driver.h
View file

@ -840,6 +840,8 @@ struct wpa_driver_capa {
#define WPA_DRIVER_FLAGS_AP_MLME 0x01000000 #define WPA_DRIVER_FLAGS_AP_MLME 0x01000000
/* Driver supports SAE with user space SME */ /* Driver supports SAE with user space SME */
#define WPA_DRIVER_FLAGS_SAE 0x02000000 #define WPA_DRIVER_FLAGS_SAE 0x02000000
/* Driver makes use of OBSS scan mechanism in wpa_supplicant */
#define WPA_DRIVER_FLAGS_OBSS_SCAN 0x04000000
unsigned int flags; unsigned int flags;
int max_scan_ssids; int max_scan_ssids;

3
src/drivers/driver_nl80211.c
View file

@ -2661,6 +2661,9 @@ broken_combination:
if (flags & NL80211_FEATURE_SAE) if (flags & NL80211_FEATURE_SAE)
capa->flags |= WPA_DRIVER_FLAGS_SAE; capa->flags |= WPA_DRIVER_FLAGS_SAE;
if (flags & NL80211_FEATURE_NEED_OBSS_SCAN)
capa->flags |= WPA_DRIVER_FLAGS_OBSS_SCAN;
} }
if (tb[NL80211_ATTR_PROBE_RESP_OFFLOAD]) { if (tb[NL80211_ATTR_PROBE_RESP_OFFLOAD]) {

11
wpa_supplicant/sme.c
View file

@ -1033,9 +1033,14 @@ void sme_sched_obss_scan(struct wpa_supplicant *wpa_s, int enable)
if (!enable) if (!enable)
return; return;
if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) || ssid == NULL || /*
ssid->mode != IEEE80211_MODE_INFRA) * Schedule OBSS scan if driver is using station SME in wpa_supplicant
return; /* Not using station SME in wpa_supplicant */ * or it expects OBSS scan to be performed by wpa_supplicant.
*/
if (!((wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) ||
(wpa_s->drv_flags & WPA_DRIVER_FLAGS_OBSS_SCAN)) ||
ssid == NULL || ssid->mode != IEEE80211_MODE_INFRA)
return;
if (!wpa_s->hw.modes) if (!wpa_s->hw.modes)
return; return;