]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
FILS: Set FILS Capability bit in management frames from station
authorJouni Malinen <jouni@qca.qualcomm.com>
Tue, 1 Sep 2015 17:00:16 +0000 (20:00 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 10 Oct 2016 18:11:46 +0000 (21:11 +0300)
If FILS is supported, indicate that in Probe Request and (Re)Association
Request frames in the Extended Capabilities element.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
wpa_supplicant/wpa_supplicant.c

index 7361ee96d1df8323e71a702046212ec803a41ec1..104ac5b5a9b9fc85cd07e436b2aad182e8dd16d8 100644 (file)
@@ -1466,6 +1466,11 @@ static void wpas_ext_capab_byte(struct wpa_supplicant *wpa_s, u8 *pos, int idx)
                if (wpa_s->conf->ftm_initiator)
                        *pos |= 0x80; /* Bit 71 - FTM initiator */
                break;
+       case 9: /* Bits 72-79 */
+#ifdef CONFIG_FILS
+               *pos |= 0x01;
+#endif /* CONFIG_FILS */
+               break;
        }
 }
 
@@ -1473,11 +1478,8 @@ static void wpas_ext_capab_byte(struct wpa_supplicant *wpa_s, u8 *pos, int idx)
 int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf, size_t buflen)
 {
        u8 *pos = buf;
-       u8 len = 6, i;
+       u8 len = 10, i;
 
-       if (len < 9 &&
-           (wpa_s->conf->ftm_initiator || wpa_s->conf->ftm_responder))
-               len = 9;
        if (len < wpa_s->extended_capa_len)
                len = wpa_s->extended_capa_len;
        if (buflen < (size_t) len + 2) {