FT: Fix MFPR flag in RSNE during FT protocol

Commit e820cf952f29 ("MFP: Add MFPR flag into station RSN IE if 802.11w
is mandatory") added indication of MFPR flag in non-FT cases, but forgot
to do so for the FT protocol cases where a different function is used to
build the RSNE. Do the same change now for that FT specific case to get
consistent behavior on indicating PMF configuration state with MFPR.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
index 46ffdca67a774405c7ba47a64a5fca14ea5f2f53..7e8b523e49218a7368d227cbdff42f8502f0bd0f 100644 (file)
--- a/src/rsn_supp/wpa_ft.c
+++ b/src/rsn_supp/wpa_ft.c
@@ -247,11 +247,10 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
        /* RSN Capabilities */
        capab = 0;
 #ifdef CONFIG_IEEE80211W
-       if (sm->mgmt_group_cipher == WPA_CIPHER_AES_128_CMAC ||
-           sm->mgmt_group_cipher == WPA_CIPHER_BIP_GMAC_128 ||
-           sm->mgmt_group_cipher == WPA_CIPHER_BIP_GMAC_256 ||
-           sm->mgmt_group_cipher == WPA_CIPHER_BIP_CMAC_256)
+       if (sm->mfp)
                capab |= WPA_CAPABILITY_MFPC;
+       if (sm->mfp == 2)
+               capab |= WPA_CAPABILITY_MFPR;
 #endif /* CONFIG_IEEE80211W */
        if (sm->ocv)
                capab |= WPA_CAPABILITY_OCVC;