From 0f105f9e5fc58602ee06abe107b1618af17673a6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 4 May 2013 11:57:56 +0300 Subject: [PATCH] HS 2.0: Move Probe Request Indication IE addition to proper place This needs to be in wpa_supplicant_extra_ies() to get consistent behavior for both scan and sched_scan cases. Signed-hostap: Jouni Malinen --- wpa_supplicant/scan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 8f9449d05..6e2bb812e 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -448,6 +448,11 @@ static struct wpabuf * wpa_supplicant_extra_ies(struct wpa_supplicant *wpa_s) #endif /* CONFIG_WPS */ +#ifdef CONFIG_HS20 + if (wpa_s->conf->hs20 && wpabuf_resize(&extra_ie, 7) == 0) + wpas_hs20_add_indication(extra_ie); +#endif /* CONFIG_HS20 */ + return extra_ie; } @@ -736,11 +741,6 @@ ssid_list_set: wpa_supplicant_optimize_freqs(wpa_s, ¶ms); extra_ie = wpa_supplicant_extra_ies(wpa_s); -#ifdef CONFIG_HS20 - if (wpa_s->conf->hs20 && wpabuf_resize(&extra_ie, 7) == 0) - wpas_hs20_add_indication(extra_ie); -#endif /* CONFIG_HS20 */ - if (params.freqs == NULL && wpa_s->next_scan_freqs) { wpa_dbg(wpa_s, MSG_DEBUG, "Optimize scan based on previously " "generated frequency list");