Deleted Added
sdiff udiff text old ( 189261 ) new ( 209158 )
full compact
ieee802_11_defs.h (189261) ieee802_11_defs.h (209158)
1/*
2 * IEEE 802.11 Frame type definitions
3 * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
4 * Copyright (c) 2007-2008 Intel Corporation
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.

--- 120 unchanged lines hidden (view full) ---

129#define WLAN_STATUS_CIPHER_REJECTED_PER_POLICY 46
130#define WLAN_STATUS_TS_NOT_CREATED 47
131#define WLAN_STATUS_DIRECT_LINK_NOT_ALLOWED 48
132#define WLAN_STATUS_DEST_STA_NOT_PRESENT 49
133#define WLAN_STATUS_DEST_STA_NOT_QOS_STA 50
134#define WLAN_STATUS_ASSOC_DENIED_LISTEN_INT_TOO_LARGE 51
135/* IEEE 802.11r */
136#define WLAN_STATUS_INVALID_FT_ACTION_FRAME_COUNT 52
1/*
2 * IEEE 802.11 Frame type definitions
3 * Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi>
4 * Copyright (c) 2007-2008 Intel Corporation
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.

--- 120 unchanged lines hidden (view full) ---

129#define WLAN_STATUS_CIPHER_REJECTED_PER_POLICY 46
130#define WLAN_STATUS_TS_NOT_CREATED 47
131#define WLAN_STATUS_DIRECT_LINK_NOT_ALLOWED 48
132#define WLAN_STATUS_DEST_STA_NOT_PRESENT 49
133#define WLAN_STATUS_DEST_STA_NOT_QOS_STA 50
134#define WLAN_STATUS_ASSOC_DENIED_LISTEN_INT_TOO_LARGE 51
135/* IEEE 802.11r */
136#define WLAN_STATUS_INVALID_FT_ACTION_FRAME_COUNT 52
137#define WLAN_STATUS_EXPECTED_RESOURCE_REQ_FT 53
138#define WLAN_STATUS_INVALID_PMKID 54
139#define WLAN_STATUS_INVALID_MDIE 55
140#define WLAN_STATUS_INVALID_FTIE 56
137#define WLAN_STATUS_INVALID_PMKID 53
138#define WLAN_STATUS_INVALID_MDIE 54
139#define WLAN_STATUS_INVALID_FTIE 55
141
142/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) */
143#define WLAN_REASON_UNSPECIFIED 1
144#define WLAN_REASON_PREV_AUTH_NOT_VALID 2
145#define WLAN_REASON_DEAUTH_LEAVING 3
146#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4
147#define WLAN_REASON_DISASSOC_AP_BUSY 5
148#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6

--- 57 unchanged lines hidden (view full) ---

206#define WLAN_EID_VENDOR_SPECIFIC 221
207
208
209/* Action frame categories (IEEE 802.11-2007, 7.3.1.11, Table 7-24) */
210#define WLAN_ACTION_SPECTRUM_MGMT 0
211#define WLAN_ACTION_QOS 1
212#define WLAN_ACTION_DLS 2
213#define WLAN_ACTION_BLOCK_ACK 3
140
141/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) */
142#define WLAN_REASON_UNSPECIFIED 1
143#define WLAN_REASON_PREV_AUTH_NOT_VALID 2
144#define WLAN_REASON_DEAUTH_LEAVING 3
145#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4
146#define WLAN_REASON_DISASSOC_AP_BUSY 5
147#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6

--- 57 unchanged lines hidden (view full) ---

205#define WLAN_EID_VENDOR_SPECIFIC 221
206
207
208/* Action frame categories (IEEE 802.11-2007, 7.3.1.11, Table 7-24) */
209#define WLAN_ACTION_SPECTRUM_MGMT 0
210#define WLAN_ACTION_QOS 1
211#define WLAN_ACTION_DLS 2
212#define WLAN_ACTION_BLOCK_ACK 3
213#define WLAN_ACTION_PUBLIC 4
214#define WLAN_ACTION_RADIO_MEASUREMENT 5
215#define WLAN_ACTION_FT 6
214#define WLAN_ACTION_RADIO_MEASUREMENT 5
215#define WLAN_ACTION_FT 6
216#define WLAN_ACTION_HT 7
216#define WLAN_ACTION_SA_QUERY 8
217#define WLAN_ACTION_SA_QUERY 8
217#define WLAN_ACTION_WMM 17
218#define WLAN_ACTION_WMM 17 /* WMM Specification 1.1 */
218
219
219/* SA Query Action frame (IEEE 802.11w/D7.0, 7.4.9) */
220/* SA Query Action frame (IEEE 802.11w/D8.0, 7.4.9) */
220#define WLAN_SA_QUERY_REQUEST 0
221#define WLAN_SA_QUERY_RESPONSE 1
222
221#define WLAN_SA_QUERY_REQUEST 0
222#define WLAN_SA_QUERY_RESPONSE 1
223
223#define WLAN_SA_QUERY_TR_ID_LEN 16
224#define WLAN_SA_QUERY_TR_ID_LEN 2
224
225/* Timeout Interval Type */
226#define WLAN_TIMEOUT_REASSOC_DEADLINE 1
227#define WLAN_TIMEOUT_KEY_LIFETIME 2
228#define WLAN_TIMEOUT_ASSOC_COMEBACK 3
229
230
231#ifdef _MSC_VER

--- 64 unchanged lines hidden (view full) ---

296 struct {
297 u8 category;
298 union {
299 struct {
300 u8 action_code;
301 u8 dialog_token;
302 u8 status_code;
303 u8 variable[0];
225
226/* Timeout Interval Type */
227#define WLAN_TIMEOUT_REASSOC_DEADLINE 1
228#define WLAN_TIMEOUT_KEY_LIFETIME 2
229#define WLAN_TIMEOUT_ASSOC_COMEBACK 3
230
231
232#ifdef _MSC_VER

--- 64 unchanged lines hidden (view full) ---

297 struct {
298 u8 category;
299 union {
300 struct {
301 u8 action_code;
302 u8 dialog_token;
303 u8 status_code;
304 u8 variable[0];
304 } STRUCT_PACKED wme_action;
305 } STRUCT_PACKED wmm_action;
305 struct{
306 u8 action_code;
307 u8 element_id;
308 u8 length;
309 u8 switch_mode;
310 u8 new_chan;
311 u8 switch_count;
312 } STRUCT_PACKED chan_switch;

--- 244 unchanged lines hidden (view full) ---

557 u8 enable;
558 u8 mode;
559} STRUCT_PACKED;
560
561
562#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
563 * 00:50:F2 */
564
306 struct{
307 u8 action_code;
308 u8 element_id;
309 u8 length;
310 u8 switch_mode;
311 u8 new_chan;
312 u8 switch_count;
313 } STRUCT_PACKED chan_switch;

--- 244 unchanged lines hidden (view full) ---

558 u8 enable;
559 u8 mode;
560} STRUCT_PACKED;
561
562
563#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
564 * 00:50:F2 */
565
565#define WME_OUI_TYPE 2
566#define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0
567#define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1
568#define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2
569#define WME_VERSION 1
566#define WMM_OUI_TYPE 2
567#define WMM_OUI_SUBTYPE_INFORMATION_ELEMENT 0
568#define WMM_OUI_SUBTYPE_PARAMETER_ELEMENT 1
569#define WMM_OUI_SUBTYPE_TSPEC_ELEMENT 2
570#define WMM_VERSION 1
570
571
571#define WME_ACTION_CODE_SETUP_REQUEST 0
572#define WME_ACTION_CODE_SETUP_RESPONSE 1
573#define WME_ACTION_CODE_TEARDOWN 2
572#define WMM_ACTION_CODE_ADDTS_REQ 0
573#define WMM_ACTION_CODE_ADDTS_RESP 1
574#define WMM_ACTION_CODE_DELTS 2
574
575
575#define WME_SETUP_RESPONSE_STATUS_ADMISSION_ACCEPTED 0
576#define WME_SETUP_RESPONSE_STATUS_INVALID_PARAMETERS 1
577#define WME_SETUP_RESPONSE_STATUS_REFUSED 3
576#define WMM_ADDTS_STATUS_ADMISSION_ACCEPTED 0
577#define WMM_ADDTS_STATUS_INVALID_PARAMETERS 1
578/* 2 - Reserved */
579#define WMM_ADDTS_STATUS_REFUSED 3
580/* 4-255 - Reserved */
578
581
579#define WME_TSPEC_DIRECTION_UPLINK 0
580#define WME_TSPEC_DIRECTION_DOWNLINK 1
581#define WME_TSPEC_DIRECTION_BI_DIRECTIONAL 3
582/* WMM TSPEC Direction Field Values */
583#define WMM_TSPEC_DIRECTION_UPLINK 0
584#define WMM_TSPEC_DIRECTION_DOWNLINK 1
585/* 2 - Reserved */
586#define WMM_TSPEC_DIRECTION_BI_DIRECTIONAL 3
582
583
584#define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */
585
586#define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */
587
588#endif /* IEEE802_11_DEFS_H */
587
588
589#define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */
590
591#define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */
592
593#endif /* IEEE802_11_DEFS_H */