Skip to content

L
linux-davinci
Commit 95d5185d authored by Jiri Benc's avatar Jiri Benc Committed by Jeff Garzik
Browse files
Options

ieee80211: convert defines to enums 

From: Gertjan van Wingerde <gwingerde@home.nl>

Attached patch cleans up the long lists of #defines for status codes,
reason codes, and information elements.
Signed-off-by: default avatarGertjan van Wingerde <gwingerde@home.nl>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
parent f13baae4
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 81 deletions
include/net/ieee80211.h
View file @ 95d5185d
...@@ -290,63 +290,67 @@ struct ieee80211_snap_hdr { ...@@ -290,63 +290,67 @@ struct ieee80211_snap_hdr {
#define WLAN_CAPABILITY_OSSS_OFDM (1<<13) #define WLAN_CAPABILITY_OSSS_OFDM (1<<13)
/* Status codes */ /* Status codes */
#define WLAN_STATUS_SUCCESS 0 enum ieee80211_statuscode {
#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 WLAN_STATUS_SUCCESS = 0,
#define WLAN_STATUS_CAPS_UNSUPPORTED 10 WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
#define WLAN_STATUS_REASSOC_NO_ASSOC 11 WLAN_STATUS_CAPS_UNSUPPORTED = 10,
#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 WLAN_STATUS_REASSOC_NO_ASSOC = 11,
#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
#define WLAN_STATUS_CHALLENGE_FAIL 15 WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
#define WLAN_STATUS_AUTH_TIMEOUT 16 WLAN_STATUS_CHALLENGE_FAIL = 15,
#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 WLAN_STATUS_AUTH_TIMEOUT = 16,
#define WLAN_STATUS_ASSOC_DENIED_RATES 18 WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
/* 802.11b */ WLAN_STATUS_ASSOC_DENIED_RATES = 18,
#define WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE 19 /* 802.11b */
#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20 WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21 WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
/* 802.11h */ WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
#define WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM 22 /* 802.11h */
#define WLAN_STATUS_ASSOC_REJECTED_BAD_POWER 23 WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
#define WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN 24 WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
/* 802.11g */ WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
#define WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME 25 /* 802.11g */
#define WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM 26 WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
/* 802.11i */ WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
#define WLAN_STATUS_INVALID_IE 40 /* 802.11i */
#define WLAN_STATUS_INVALID_GROUP_CIPHER 41 WLAN_STATUS_INVALID_IE = 40,
#define WLAN_STATUS_INVALID_PAIRWISE_CIPHER 42 WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
#define WLAN_STATUS_INVALID_AKMP 43 WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
#define WLAN_STATUS_UNSUPP_RSN_VERSION 44 WLAN_STATUS_INVALID_AKMP = 43,
#define WLAN_STATUS_INVALID_RSN_IE_CAP 45 WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
#define WLAN_STATUS_CIPHER_SUITE_REJECTED 46 WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
};
/* Reason codes */ /* Reason codes */
#define WLAN_REASON_UNSPECIFIED 1 enum ieee80211_reasoncode {
#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 WLAN_REASON_UNSPECIFIED = 1,
#define WLAN_REASON_DEAUTH_LEAVING 3 WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 WLAN_REASON_DEAUTH_LEAVING = 3,
#define WLAN_REASON_DISASSOC_AP_BUSY 5 WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 WLAN_REASON_DISASSOC_AP_BUSY = 5,
#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
/* 802.11h */ WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
#define WLAN_REASON_DISASSOC_BAD_POWER 10 /* 802.11h */
#define WLAN_REASON_DISASSOC_BAD_SUPP_CHAN 11 WLAN_REASON_DISASSOC_BAD_POWER = 10,
/* 802.11i */ WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
#define WLAN_REASON_INVALID_IE 13 /* 802.11i */
#define WLAN_REASON_MIC_FAILURE 14 WLAN_REASON_INVALID_IE = 13,
#define WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT 15 WLAN_REASON_MIC_FAILURE = 14,
#define WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT 16 WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
#define WLAN_REASON_IE_DIFFERENT 17 WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
#define WLAN_REASON_INVALID_GROUP_CIPHER 18 WLAN_REASON_IE_DIFFERENT = 17,
#define WLAN_REASON_INVALID_PAIRWISE_CIPHER 19 WLAN_REASON_INVALID_GROUP_CIPHER = 18,
#define WLAN_REASON_INVALID_AKMP 20 WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
#define WLAN_REASON_UNSUPP_RSN_VERSION 21 WLAN_REASON_INVALID_AKMP = 20,
#define WLAN_REASON_INVALID_RSN_IE_CAP 22 WLAN_REASON_UNSUPP_RSN_VERSION = 21,
#define WLAN_REASON_IEEE8021X_FAILED 23 WLAN_REASON_INVALID_RSN_IE_CAP = 22,
#define WLAN_REASON_CIPHER_SUITE_REJECTED 24 WLAN_REASON_IEEE8021X_FAILED = 23,
WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
};
#define IEEE80211_STATMASK_SIGNAL (1<<0) #define IEEE80211_STATMASK_SIGNAL (1<<0)
...@@ -525,32 +529,34 @@ Total: 28-2340 bytes ...@@ -525,32 +529,34 @@ Total: 28-2340 bytes
#define BEACON_PROBE_SSID_ID_POSITION 12 #define BEACON_PROBE_SSID_ID_POSITION 12
/* Management Frame Information Element Types */ /* Management Frame Information Element Types */
#define MFIE_TYPE_SSID 0 enum ieee80211_mfie {
#define MFIE_TYPE_RATES 1 MFIE_TYPE_SSID = 0,
#define MFIE_TYPE_FH_SET 2 MFIE_TYPE_RATES = 1,
#define MFIE_TYPE_DS_SET 3 MFIE_TYPE_FH_SET = 2,
#define MFIE_TYPE_CF_SET 4 MFIE_TYPE_DS_SET = 3,
#define MFIE_TYPE_TIM 5 MFIE_TYPE_CF_SET = 4,
#define MFIE_TYPE_IBSS_SET 6 MFIE_TYPE_TIM = 5,
#define MFIE_TYPE_COUNTRY 7 MFIE_TYPE_IBSS_SET = 6,
#define MFIE_TYPE_HOP_PARAMS 8 MFIE_TYPE_COUNTRY = 7,
#define MFIE_TYPE_HOP_TABLE 9 MFIE_TYPE_HOP_PARAMS = 8,
#define MFIE_TYPE_REQUEST 10 MFIE_TYPE_HOP_TABLE = 9,
#define MFIE_TYPE_CHALLENGE 16 MFIE_TYPE_REQUEST = 10,
#define MFIE_TYPE_POWER_CONSTRAINT 32 MFIE_TYPE_CHALLENGE = 16,
#define MFIE_TYPE_POWER_CAPABILITY 33 MFIE_TYPE_POWER_CONSTRAINT = 32,
#define MFIE_TYPE_TPC_REQUEST 34 MFIE_TYPE_POWER_CAPABILITY = 33,
#define MFIE_TYPE_TPC_REPORT 35 MFIE_TYPE_TPC_REQUEST = 34,
#define MFIE_TYPE_SUPP_CHANNELS 36 MFIE_TYPE_TPC_REPORT = 35,
#define MFIE_TYPE_CSA 37 MFIE_TYPE_SUPP_CHANNELS = 36,
#define MFIE_TYPE_MEASURE_REQUEST 38 MFIE_TYPE_CSA = 37,
#define MFIE_TYPE_MEASURE_REPORT 39 MFIE_TYPE_MEASURE_REQUEST = 38,
#define MFIE_TYPE_QUIET 40 MFIE_TYPE_MEASURE_REPORT = 39,
#define MFIE_TYPE_IBSS_DFS 41 MFIE_TYPE_QUIET = 40,
#define MFIE_TYPE_ERP_INFO 42 MFIE_TYPE_IBSS_DFS = 41,
#define MFIE_TYPE_RSN 48 MFIE_TYPE_ERP_INFO = 42,
#define MFIE_TYPE_RATES_EX 50 MFIE_TYPE_RSN = 48,
#define MFIE_TYPE_GENERIC 221 MFIE_TYPE_RATES_EX = 50,
MFIE_TYPE_GENERIC = 221,
};
struct ieee80211_info_element_hdr { struct ieee80211_info_element_hdr {
u8 id; u8 id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment