diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-09 15:20:40 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-10 09:26:29 -0700 |
| commit | 4530cfd4d14a77c58e35393b91e40f8dd9d62697 (patch) | |
| tree | 53014f1285c99fb848f49f93687f0b7b8836490e /wpa_supplicant/ctrl_iface.c | |
| parent | 8367dc909f536f600c7474582fe0a96bef7c78fc (diff) | |
| download | external_wpa_supplicant_8-4530cfd4d14a77c58e35393b91e40f8dd9d62697.zip external_wpa_supplicant_8-4530cfd4d14a77c58e35393b91e40f8dd9d62697.tar.gz external_wpa_supplicant_8-4530cfd4d14a77c58e35393b91e40f8dd9d62697.tar.bz2 | |
wpa_supplicant: Update to 07-Sep-2012 TOT
commit 44256451130c4766e4a019162de17d0734444ee9
Author: Arik Nemtsov <arik@wizery.com>
Date: Fri Sep 7 00:22:40 2012 +0300
AP: Configure basic rates from iface and not conf
Skipped patches:
20ed5e40ba95440a1946cf2dffad3047fb620582
cf8baca6a5719f4f3257631e03317affee015417
a297201df15656dbb0f37e90f3410d9e8102c6fd
620c783753bddd37988269314862dc7e4a62f700
Change-Id: I857aa80af6d1a21b61f7c03a085e7dfc6066d61a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/ctrl_iface.c')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 4f0c43d..480c077 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -2792,27 +2792,28 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, #endif /* CONFIG_WIFI_DISPLAY */ #ifdef CONFIG_INTERWORKING - if (mask & WPA_BSS_MASK_INTERNETW) { + if ((mask & WPA_BSS_MASK_INTERNETW) && bss->anqp) { + struct wpa_bss_anqp *anqp = bss->anqp; pos = anqp_add_hex(pos, end, "anqp_venue_name", - bss->anqp_venue_name); + anqp->venue_name); pos = anqp_add_hex(pos, end, "anqp_network_auth_type", - bss->anqp_network_auth_type); + anqp->network_auth_type); pos = anqp_add_hex(pos, end, "anqp_roaming_consortium", - bss->anqp_roaming_consortium); + anqp->roaming_consortium); pos = anqp_add_hex(pos, end, "anqp_ip_addr_type_availability", - bss->anqp_ip_addr_type_availability); + anqp->ip_addr_type_availability); pos = anqp_add_hex(pos, end, "anqp_nai_realm", - bss->anqp_nai_realm); - pos = anqp_add_hex(pos, end, "anqp_3gpp", bss->anqp_3gpp); + anqp->nai_realm); + pos = anqp_add_hex(pos, end, "anqp_3gpp", anqp->anqp_3gpp); pos = anqp_add_hex(pos, end, "anqp_domain_name", - bss->anqp_domain_name); + anqp->domain_name); #ifdef CONFIG_HS20 pos = anqp_add_hex(pos, end, "hs20_operator_friendly_name", - bss->hs20_operator_friendly_name); + anqp->hs20_operator_friendly_name); pos = anqp_add_hex(pos, end, "hs20_wan_metrics", - bss->hs20_wan_metrics); + anqp->hs20_wan_metrics); pos = anqp_add_hex(pos, end, "hs20_connection_capability", - bss->hs20_connection_capability); + anqp->hs20_connection_capability); #endif /* CONFIG_HS20 */ } #endif /* CONFIG_INTERWORKING */ @@ -4381,6 +4382,7 @@ static int wpa_supplicant_driver_cmd(struct wpa_supplicant *wpa_s, char *cmd, } #endif + char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s, char *buf, size_t *resp_len) { |