diff mbox

[04/10] wpa_supplicant: get scan_result IE also from beacons

Message ID 1477570712-9848-4-git-send-email-andrei.otcheretianski@intel.com
State Accepted
Headers show

Commit Message

Andrei Otcheretianski Oct. 27, 2016, 12:18 p.m. UTC 
From: Eliad Peller <eliad@wizery.com>

No reason to require ie_len if only beacon_ie_len is given

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
---
 wpa_supplicant/scan.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index bfde0af..2f4621f 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -1618,7 +1618,13 @@  static int wpa_scan_get_max_rate(const struct wpa_scan_res *res)
  */
 const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
 {
-	return get_ie((const u8 *) (res + 1), res->ie_len, ie);
+	size_t ie_len = res->ie_len;
+
+	/* use the beacon ies if res->ie_len is not available */
+	if (!ie_len)
+		ie_len = res->beacon_ie_len;
+
+	return get_ie((const u8 *)(res + 1), ie_len, ie);
 }