diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2011-09-08 20:52:23 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2011-09-26 11:51:58 +0300 |
| commit | daa30c23aab5212c1a716b5aa6453577a9f1ff48 (patch) | |
| tree | adf547e52dbc8c22ad0ad810ed625007ef5ecf69 /src/common | |
| parent | 8a8c1c0ea5106873f196531617454888d4c2e41b (diff) | |
| download | external_wpa_supplicant_8_ti-daa30c23aab5212c1a716b5aa6453577a9f1ff48.zip external_wpa_supplicant_8_ti-daa30c23aab5212c1a716b5aa6453577a9f1ff48.tar.gz external_wpa_supplicant_8_ti-daa30c23aab5212c1a716b5aa6453577a9f1ff48.tar.bz2 | |
Rename and fix ANQP definitions to match IEEE Std 802.11u-2011
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/ieee802_11_defs.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h index 113eea2..1c3d3cf 100644 --- a/src/common/ieee802_11_defs.h +++ b/src/common/ieee802_11_defs.h @@ -274,31 +274,33 @@ #define WLAN_TIMEOUT_KEY_LIFETIME 2 #define WLAN_TIMEOUT_ASSOC_COMEBACK 3 -/* Advertisement Protocol ID definitions (IEEE 802.11u) */ +/* Advertisement Protocol ID definitions (IEEE Std 802.11u-2011) */ enum adv_proto_id { - NATIVE_QUERY_PROTOCOL = 0, + ACCESS_NETWORK_QUERY_PROTOCOL = 0, MIH_INFO_SERVICE = 1, MIH_CMD_AND_EVENT_DISCOVERY = 2, EMERGENCY_ALERT_SYSTEM = 3, - LOCATION_TO_SERVICE = 4, ADV_PROTO_VENDOR_SPECIFIC = 221 }; -/* Native Query Protocol info ID definitions (IEEE 802.11u) */ -enum nqp_info_id { - NQP_CAPABILITY_LIST = 256, - NQP_VENUE_NAME = 257, - NQP_EMERGENCY_CALL_NUMBER = 258, - NQP_NETWORK_AUTH_TYPE = 259, - NQP_ROAMING_CONSORTIUM = 260, - NQP_IP_ADDR_TYPE_AVAILABILITY = 261, - NQP_NAI_REALM = 262, - NQP_3GPP_CELLULAR_NETWORK = 263, - NQP_AP_GEOSPATIAL_LOCATION = 264, - NQP_AP_CIVIC_LOCATION = 265, - NQP_DOMAIN_NAME = 266, - NQP_EMERGENCY_ALERT_URI = 267, - NQP_VENDOR_SPECIFIC = 56797 +/* Access Network Query Protocol info ID definitions (IEEE Std 802.11u-2011) */ +enum anqp_info_id { + ANQP_QUERY_LIST = 256, + ANQP_CAPABILITY_LIST = 257, + ANQP_VENUE_NAME = 258, + ANQP_EMERGENCY_CALL_NUMBER = 259, + ANQP_NETWORK_AUTH_TYPE = 260, + ANQP_ROAMING_CONSORTIUM = 261, + ANQP_IP_ADDR_TYPE_AVAILABILITY = 262, + ANQP_NAI_REALM = 263, + ANQP_3GPP_CELLULAR_NETWORK = 264, + ANQP_AP_GEOSPATIAL_LOCATION = 265, + ANQP_AP_CIVIC_LOCATION = 266, + ANQP_AP_LOCATION_PUBLIC_URI = 267, + ANQP_DOMAIN_NAME = 268, + ANQP_EMERGENCY_ALERT_URI = 269, + ANQP_EMERGENCY_NAI = 271, + ANQP_VENDOR_SPECIFIC = 56797 }; |