IEEE Std 802.11r-2008 has been released, so update references

diff --git a/hostapd/defconfig b/hostapd/defconfig
index 4cfaee90f2062f9f87cf9034a95f1a70c2babef2..82173a755bd8b6830ed587444d1bc739766893e9 100644 (file)
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -115,10 +115,7 @@ CONFIG_PKCS12=y
 # Build IPv6 support for RADIUS operations
 CONFIG_IPV6=y
 
-# IEEE 802.11r/D4.1 (Fast BSS Transition)
-# This enables an experimental implementation of a draft version of
-# IEEE 802.11r. This draft is still subject to change, so it should be noted
-# that this version may not comply with the final standard.
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
 #CONFIG_IEEE80211R=y
 
 # Use the hostapd's IEEE 802.11 authentication (ACL), but without

diff --git a/hostapd/wpa.h b/hostapd/wpa.h
index 5bcb6a60f14c0f444c0f04dfa3229e805a74450a..74bea271234b79842444945d4f45a46e847c319f 100644 (file)
--- a/hostapd/wpa.h
+++ b/hostapd/wpa.h
@@ -22,7 +22,8 @@
 #pragma pack(push, 1)
 #endif /* _MSC_VER */
 
-/* IEEE 802.11r/D8.0, 11A.10.3 - Remote request/response frame definition */
+/* IEEE Std 802.11r-2008, 11A.10.3 - Remote request/response frame definition
+ */
 struct ft_rrb_frame {
        u8 frame_type; /* RSN_REMOTE_FRAME_TYPE_FT_RRB */
        u8 packet_type; /* FT_PACKET_REQUEST/FT_PACKET_RESPONSE */

diff --git a/hostapd/wpa_ft.c b/hostapd/wpa_ft.c
index 44249e2039a3b2d4af147cc448c5bf61f36fc8a3..7da9508ed59b52d15551506b10f9e81a92360aaf 100644 (file)
--- a/hostapd/wpa_ft.c
+++ b/hostapd/wpa_ft.c
@@ -1274,7 +1274,7 @@ int wpa_ft_rrb_rx(struct wpa_authenticator *wpa_auth, const u8 *src_addr,
                   MAC2STR(frame->ap_address));
 
        if (frame->frame_type != RSN_REMOTE_FRAME_TYPE_FT_RRB) {
-               /* Discard frame per IEEE 802.11r/D8.0, 10A.10.3 */
+               /* Discard frame per IEEE Std 802.11r-2008, 11A.10.3 */
                wpa_printf(MSG_DEBUG, "FT: RRB discarded frame with "
                           "unrecognized type %d", frame->frame_type);
                return -1;

diff --git a/src/common/wpa_common.c b/src/common/wpa_common.c
index a63622b942f5e4d1e96b5e0ec7f14ee4ff416388..e1ae894ba6c81afe3ddcac4ec27f13b77c603b10 100644 (file)
--- a/src/common/wpa_common.c
+++ b/src/common/wpa_common.c
@@ -394,7 +394,7 @@ int wpa_parse_wpa_ie_rsn(const u8 *rsn_ie, size_t rsn_ie_len,
 /**
  * wpa_derive_pmk_r0 - Derive PMK-R0 and PMKR0Name
  *
- * IEEE 802.11r/D9.0 - 8.5.1.5.3
+ * IEEE Std 802.11r-2008 - 8.5.1.5.3
  */
 void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len,
                       const u8 *ssid, size_t ssid_len,
@@ -449,7 +449,7 @@ void wpa_derive_pmk_r0(const u8 *xxkey, size_t xxkey_len,
 /**
  * wpa_derive_pmk_r1_name - Derive PMKR1Name
  *
- * IEEE 802.11r/D9.0 - 8.5.1.5.4
+ * IEEE Std 802.11r-2008 - 8.5.1.5.4
  */
 void wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id,
                            const u8 *s1kh_id, u8 *pmk_r1_name)
@@ -479,7 +479,7 @@ void wpa_derive_pmk_r1_name(const u8 *pmk_r0_name, const u8 *r1kh_id,
 /**
  * wpa_derive_pmk_r1 - Derive PMK-R1 and PMKR1Name from PMK-R0
  *
- * IEEE 802.11r/D9.0 - 8.5.1.5.4
+ * IEEE Std 802.11r-2008 - 8.5.1.5.4
  */
 void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name,
                       const u8 *r1kh_id, const u8 *s1kh_id,
@@ -504,7 +504,7 @@ void wpa_derive_pmk_r1(const u8 *pmk_r0, const u8 *pmk_r0_name,
 /**
  * wpa_pmk_r1_to_ptk - Derive PTK and PTKName from PMK-R1
  *
- * IEEE 802.11r/D9.0 - 8.5.1.5.5
+ * IEEE Std 802.11r-2008 - 8.5.1.5.5
  */
 void wpa_pmk_r1_to_ptk(const u8 *pmk_r1, const u8 *snonce, const u8 *anonce,
                       const u8 *sta_addr, const u8 *bssid,

diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
index b2ffd5594e352565a43e1dfe9cae8c84100e1fc6..a5060a62406b82f1c9dc3c7f825dd04ac17e4e2f 100644 (file)
--- a/src/rsn_supp/wpa_ft.c
+++ b/src/rsn_supp/wpa_ft.c
@@ -243,7 +243,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
 
        if (kck) {
                /*
-                * IEEE 802.11r/D9.0, 11A.8.4
+                * IEEE Std 802.11r-2008, 11A.8.4
                 * MIC shall be calculated over:
                 * non-AP STA MAC address
                 * Target AP MAC address

diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index d8567b9ad384ea15637c2fb0bd2e6464b775ff86..2ad2bb89320b593750d896d7b6b3b24d939e58d5 100644 (file)
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -353,10 +353,7 @@ CONFIG_PEERKEY=y
 #WIRELESS_DEV=/usr/src/wireless-dev
 #CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
 
-# IEEE 802.11r/D4.1 (Fast BSS Transition)
-# This enables an experimental implementation of a draft version of
-# IEEE 802.11r. This draft is still subject to change, so it should be noted
-# that this version may not comply with the final standard.
+# IEEE Std 802.11r-2008 (Fast BSS Transition)
 #CONFIG_IEEE80211R=y
 
 # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)