aboutsummaryrefslogtreecommitdiffstats
path: root/src/rsn_supp
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-08-30 11:59:39 (GMT)
committerJouni Malinen <j@w1.fi>2008-08-30 11:59:39 (GMT)
commit0b60b0aaadaeec905d8e07a56b88cdfa83cad300 (patch)
tree142434f6e58e51ecbf176d941e0cc959d4a6a37e /src/rsn_supp
parentb3f240bc0e3fbab466cd819f024451189af4fe9c (diff)
downloadhostap-06-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.zip
hostap-06-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.tar.gz
hostap-06-0b60b0aaadaeec905d8e07a56b88cdfa83cad300.tar.bz2
Updated MFP defines based on IEEE 802.11w/D6.0 and use new MFPC/MFPR
This adds most of the new frame format and identifier definitions from IEEE 802.11w/D6.0. In addition, the RSN IE capability field values for MFP is replaced with the new two-bit version with MFPC (capable) and MFPR (required) processing.
Diffstat (limited to 'src/rsn_supp')
-rw-r--r--src/rsn_supp/wpa_ft.c2
-rw-r--r--src/rsn_supp/wpa_ie.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
index a5060a6..7cc11e6 100644
--- a/src/rsn_supp/wpa_ft.c
+++ b/src/rsn_supp/wpa_ft.c
@@ -193,7 +193,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
capab = 0;
#ifdef CONFIG_IEEE80211W
if (sm->mgmt_group_cipher == WPA_CIPHER_AES_128_CMAC)
- capab |= WPA_CAPABILITY_MGMT_FRAME_PROTECTION;
+ capab |= WPA_CAPABILITY_MFPC;
#endif /* CONFIG_IEEE80211W */
WPA_PUT_LE16(pos, capab);
pos += 2;
diff --git a/src/rsn_supp/wpa_ie.c b/src/rsn_supp/wpa_ie.c
index b3bb8d8..94a542d 100644
--- a/src/rsn_supp/wpa_ie.c
+++ b/src/rsn_supp/wpa_ie.c
@@ -327,7 +327,7 @@ static int wpa_gen_wpa_ie_rsn(u8 *rsn_ie, size_t rsn_ie_len,
capab = 0;
#ifdef CONFIG_IEEE80211W
if (mgmt_group_cipher == WPA_CIPHER_AES_128_CMAC)
- capab |= WPA_CAPABILITY_MGMT_FRAME_PROTECTION;
+ capab |= WPA_CAPABILITY_MFPC;
#endif /* CONFIG_IEEE80211W */
WPA_PUT_LE16(pos, capab);
pos += 2;