DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

HT: Let the driver advertise its supported SMPS modes for AP mode

Browse source 
Add smps_modes field, and let the driver fill it with its supported SMPS
modes (static/dynamic). This will let us start an AP with specific SMPS
mode (e.g., dynamic) that will allow it to reduce its power usage.

Signed-off-by: Eliad Peller <eliad@wizery.com>
This commit is contained in:
Eliad Peller 2014-10-19 23:21:39 -04:00 committed by Jouni Malinen
parent eac687ee7d
commit 04ee647d58
7 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hostapd/main.c
View file

@ -213,6 +213,7 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
if (hapd->driver->get_capa && if (hapd->driver->get_capa &&
hapd->driver->get_capa(hapd->drv_priv, &capa) == 0) { hapd->driver->get_capa(hapd->drv_priv, &capa) == 0) {
iface->drv_flags = capa.flags; iface->drv_flags = capa.flags;
iface->smps_modes = capa.smps_modes;
iface->probe_resp_offloads = capa.probe_resp_offloads; iface->probe_resp_offloads = capa.probe_resp_offloads;
iface->extended_capa = capa.extended_capa; iface->extended_capa = capa.extended_capa;
iface->extended_capa_mask = capa.extended_capa_mask; iface->extended_capa_mask = capa.extended_capa_mask;

3
src/ap/hostapd.h
View file

@ -296,6 +296,9 @@ struct hostapd_iface {
unsigned int drv_flags; unsigned int drv_flags;
/* SMPS modes supported by the driver (WPA_DRIVER_SMPS_MODE_*) */
unsigned int smps_modes;
/* /*
* A bitmap of supported protocols for probe response offload. See * A bitmap of supported protocols for probe response offload. See
* struct wpa_driver_capa in driver.h * struct wpa_driver_capa in driver.h

23
src/ap/hw_features.c
View file

@ -746,11 +746,24 @@ static int ieee80211n_supported_ht_capab(struct hostapd_iface *iface)
return 0; return 0;
} }
if ((conf & HT_CAP_INFO_SMPS_MASK) != (hw & HT_CAP_INFO_SMPS_MASK) && switch (conf & HT_CAP_INFO_SMPS_MASK) {
(conf & HT_CAP_INFO_SMPS_MASK) != HT_CAP_INFO_SMPS_DISABLED) { case HT_CAP_INFO_SMPS_STATIC:
wpa_printf(MSG_ERROR, "Driver does not support configured " if (!(iface->smps_modes & WPA_DRIVER_SMPS_MODE_STATIC)) {
"HT capability [SMPS-*]"); wpa_printf(MSG_ERROR,
return 0; "Driver does not support configured HT capability [SMPS-STATIC]");
return 0;
}
break;
case HT_CAP_INFO_SMPS_DYNAMIC:
if (!(iface->smps_modes & WPA_DRIVER_SMPS_MODE_DYNAMIC)) {
wpa_printf(MSG_ERROR,
"Driver does not support configured HT capability [SMPS-DYNAMIC]");
return 0;
}
break;
case HT_CAP_INFO_SMPS_DISABLED:
default:
break;
} }
if ((conf & HT_CAP_INFO_GREEN_FIELD) && if ((conf & HT_CAP_INFO_GREEN_FIELD) &&

4
src/drivers/driver.h
View file

@ -1056,6 +1056,10 @@ struct wpa_driver_capa {
#define WPA_DRIVER_FLAGS_MESH 0x0000000100000000ULL #define WPA_DRIVER_FLAGS_MESH 0x0000000100000000ULL
u64 flags; u64 flags;
#define WPA_DRIVER_SMPS_MODE_STATIC 0x00000001
#define WPA_DRIVER_SMPS_MODE_DYNAMIC 0x00000002
unsigned int smps_modes;
int max_scan_ssids; int max_scan_ssids;
int max_sched_scan_ssids; int max_sched_scan_ssids;
int sched_scan_supported; int sched_scan_supported;

1
wpa_supplicant/ap.c
View file

@ -555,6 +555,7 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
return -1; return -1;
hapd_iface->owner = wpa_s; hapd_iface->owner = wpa_s;
hapd_iface->drv_flags = wpa_s->drv_flags; hapd_iface->drv_flags = wpa_s->drv_flags;
hapd_iface->smps_modes = wpa_s->drv_smps_modes;
hapd_iface->probe_resp_offloads = wpa_s->probe_resp_offloads; hapd_iface->probe_resp_offloads = wpa_s->probe_resp_offloads;
hapd_iface->extended_capa = wpa_s->extended_capa; hapd_iface->extended_capa = wpa_s->extended_capa;
hapd_iface->extended_capa_mask = wpa_s->extended_capa_mask; hapd_iface->extended_capa_mask = wpa_s->extended_capa_mask;

1
wpa_supplicant/wpa_supplicant.c
View file

@ -3804,6 +3804,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
wpa_s->drv_capa_known = 1; wpa_s->drv_capa_known = 1;
wpa_s->drv_flags = capa.flags; wpa_s->drv_flags = capa.flags;
wpa_s->drv_enc = capa.enc; wpa_s->drv_enc = capa.enc;
wpa_s->drv_smps_modes = capa.smps_modes;
wpa_s->probe_resp_offloads = capa.probe_resp_offloads; wpa_s->probe_resp_offloads = capa.probe_resp_offloads;
wpa_s->max_scan_ssids = capa.max_scan_ssids; wpa_s->max_scan_ssids = capa.max_scan_ssids;
wpa_s->max_sched_scan_ssids = capa.max_sched_scan_ssids; wpa_s->max_sched_scan_ssids = capa.max_sched_scan_ssids;

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -574,6 +574,7 @@ struct wpa_supplicant {
u64 drv_flags; u64 drv_flags;
unsigned int drv_enc; unsigned int drv_enc;
unsigned int drv_smps_modes;
/* /*
* A bitmap of supported protocols for probe response offload. See * A bitmap of supported protocols for probe response offload. See