diff options
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ieee80211.h')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ieee80211.h | 107 |
1 files changed, 3 insertions, 104 deletions
diff --git a/drivers/net/wireless/ipw2x00/ieee80211.h b/drivers/net/wireless/ipw2x00/ieee80211.h index 7515fad00f92..f82435eae49d 100644 --- a/drivers/net/wireless/ipw2x00/ieee80211.h +++ b/drivers/net/wireless/ipw2x00/ieee80211.h | |||
@@ -54,65 +54,12 @@ | |||
54 | #define MIN_FRAG_THRESHOLD 256U | 54 | #define MIN_FRAG_THRESHOLD 256U |
55 | #define MAX_FRAG_THRESHOLD 2346U | 55 | #define MAX_FRAG_THRESHOLD 2346U |
56 | 56 | ||
57 | /* Frame control field constants */ | ||
58 | #define IEEE80211_FCTL_VERS 0x0003 | ||
59 | #define IEEE80211_FCTL_FTYPE 0x000c | ||
60 | #define IEEE80211_FCTL_STYPE 0x00f0 | ||
61 | #define IEEE80211_FCTL_TODS 0x0100 | ||
62 | #define IEEE80211_FCTL_FROMDS 0x0200 | ||
63 | #define IEEE80211_FCTL_MOREFRAGS 0x0400 | ||
64 | #define IEEE80211_FCTL_RETRY 0x0800 | ||
65 | #define IEEE80211_FCTL_PM 0x1000 | ||
66 | #define IEEE80211_FCTL_MOREDATA 0x2000 | ||
67 | #define IEEE80211_FCTL_PROTECTED 0x4000 | ||
68 | #define IEEE80211_FCTL_ORDER 0x8000 | ||
69 | |||
70 | #define IEEE80211_FTYPE_MGMT 0x0000 | ||
71 | #define IEEE80211_FTYPE_CTL 0x0004 | ||
72 | #define IEEE80211_FTYPE_DATA 0x0008 | ||
73 | |||
74 | /* management */ | ||
75 | #define IEEE80211_STYPE_ASSOC_REQ 0x0000 | ||
76 | #define IEEE80211_STYPE_ASSOC_RESP 0x0010 | ||
77 | #define IEEE80211_STYPE_REASSOC_REQ 0x0020 | ||
78 | #define IEEE80211_STYPE_REASSOC_RESP 0x0030 | ||
79 | #define IEEE80211_STYPE_PROBE_REQ 0x0040 | ||
80 | #define IEEE80211_STYPE_PROBE_RESP 0x0050 | ||
81 | #define IEEE80211_STYPE_BEACON 0x0080 | ||
82 | #define IEEE80211_STYPE_ATIM 0x0090 | ||
83 | #define IEEE80211_STYPE_DISASSOC 0x00A0 | ||
84 | #define IEEE80211_STYPE_AUTH 0x00B0 | ||
85 | #define IEEE80211_STYPE_DEAUTH 0x00C0 | ||
86 | #define IEEE80211_STYPE_ACTION 0x00D0 | ||
87 | |||
88 | /* control */ | ||
89 | #define IEEE80211_STYPE_PSPOLL 0x00A0 | ||
90 | #define IEEE80211_STYPE_RTS 0x00B0 | ||
91 | #define IEEE80211_STYPE_CTS 0x00C0 | ||
92 | #define IEEE80211_STYPE_ACK 0x00D0 | ||
93 | #define IEEE80211_STYPE_CFEND 0x00E0 | ||
94 | #define IEEE80211_STYPE_CFENDACK 0x00F0 | ||
95 | |||
96 | /* data */ | ||
97 | #define IEEE80211_STYPE_DATA 0x0000 | ||
98 | #define IEEE80211_STYPE_DATA_CFACK 0x0010 | ||
99 | #define IEEE80211_STYPE_DATA_CFPOLL 0x0020 | ||
100 | #define IEEE80211_STYPE_DATA_CFACKPOLL 0x0030 | ||
101 | #define IEEE80211_STYPE_NULLFUNC 0x0040 | ||
102 | #define IEEE80211_STYPE_CFACK 0x0050 | ||
103 | #define IEEE80211_STYPE_CFPOLL 0x0060 | ||
104 | #define IEEE80211_STYPE_CFACKPOLL 0x0070 | ||
105 | #define IEEE80211_STYPE_QOS_DATA 0x0080 | ||
106 | |||
107 | #define IEEE80211_SCTL_FRAG 0x000F | ||
108 | #define IEEE80211_SCTL_SEQ 0xFFF0 | ||
109 | |||
110 | /* QOS control */ | 57 | /* QOS control */ |
111 | #define IEEE80211_QCTL_TID 0x000F | 58 | #define IEEE80211_QCTL_TID 0x000F |
112 | 59 | ||
113 | /* debug macros */ | 60 | /* debug macros */ |
114 | 61 | ||
115 | #ifdef CONFIG_IEEE80211_DEBUG | 62 | #ifdef CONFIG_LIBIPW_DEBUG |
116 | extern u32 ieee80211_debug_level; | 63 | extern u32 ieee80211_debug_level; |
117 | #define IEEE80211_DEBUG(level, fmt, args...) \ | 64 | #define IEEE80211_DEBUG(level, fmt, args...) \ |
118 | do { if (ieee80211_debug_level & (level)) \ | 65 | do { if (ieee80211_debug_level & (level)) \ |
@@ -128,7 +75,7 @@ static inline bool ieee80211_ratelimit_debug(u32 level) | |||
128 | { | 75 | { |
129 | return false; | 76 | return false; |
130 | } | 77 | } |
131 | #endif /* CONFIG_IEEE80211_DEBUG */ | 78 | #endif /* CONFIG_LIBIPW_DEBUG */ |
132 | 79 | ||
133 | /* | 80 | /* |
134 | * To use the debug system: | 81 | * To use the debug system: |
@@ -152,7 +99,7 @@ static inline bool ieee80211_ratelimit_debug(u32 level) | |||
152 | * you simply need to add your entry to the ieee80211_debug_level array. | 99 | * you simply need to add your entry to the ieee80211_debug_level array. |
153 | * | 100 | * |
154 | * If you do not see debug_level in /proc/net/ieee80211 then you do not have | 101 | * If you do not see debug_level in /proc/net/ieee80211 then you do not have |
155 | * CONFIG_IEEE80211_DEBUG defined in your kernel configuration | 102 | * CONFIG_LIBIPW_DEBUG defined in your kernel configuration |
156 | * | 103 | * |
157 | */ | 104 | */ |
158 | 105 | ||
@@ -217,23 +164,6 @@ struct ieee80211_snap_hdr { | |||
217 | #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG) | 164 | #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG) |
218 | #define WLAN_GET_SEQ_SEQ(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) | 165 | #define WLAN_GET_SEQ_SEQ(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) |
219 | 166 | ||
220 | /* Action categories - 802.11h */ | ||
221 | enum ieee80211_actioncategories { | ||
222 | WLAN_ACTION_SPECTRUM_MGMT = 0, | ||
223 | /* Reserved 1-127 */ | ||
224 | /* Error 128-255 */ | ||
225 | }; | ||
226 | |||
227 | /* Action details - 802.11h */ | ||
228 | enum ieee80211_actiondetails { | ||
229 | WLAN_ACTION_CATEGORY_MEASURE_REQUEST = 0, | ||
230 | WLAN_ACTION_CATEGORY_MEASURE_REPORT = 1, | ||
231 | WLAN_ACTION_CATEGORY_TPC_REQUEST = 2, | ||
232 | WLAN_ACTION_CATEGORY_TPC_REPORT = 3, | ||
233 | WLAN_ACTION_CATEGORY_CHANNEL_SWITCH = 4, | ||
234 | /* 5 - 255 Reserved */ | ||
235 | }; | ||
236 | |||
237 | #define IEEE80211_STATMASK_SIGNAL (1<<0) | 167 | #define IEEE80211_STATMASK_SIGNAL (1<<0) |
238 | #define IEEE80211_STATMASK_RSSI (1<<1) | 168 | #define IEEE80211_STATMASK_RSSI (1<<1) |
239 | #define IEEE80211_STATMASK_NOISE (1<<2) | 169 | #define IEEE80211_STATMASK_NOISE (1<<2) |
@@ -411,37 +341,6 @@ Total: 28-2340 bytes | |||
411 | 341 | ||
412 | #define BEACON_PROBE_SSID_ID_POSITION 12 | 342 | #define BEACON_PROBE_SSID_ID_POSITION 12 |
413 | 343 | ||
414 | /* Management Frame Information Element Types */ | ||
415 | enum ieee80211_mfie { | ||
416 | MFIE_TYPE_SSID = 0, | ||
417 | MFIE_TYPE_RATES = 1, | ||
418 | MFIE_TYPE_FH_SET = 2, | ||
419 | MFIE_TYPE_DS_SET = 3, | ||
420 | MFIE_TYPE_CF_SET = 4, | ||
421 | MFIE_TYPE_TIM = 5, | ||
422 | MFIE_TYPE_IBSS_SET = 6, | ||
423 | MFIE_TYPE_COUNTRY = 7, | ||
424 | MFIE_TYPE_HOP_PARAMS = 8, | ||
425 | MFIE_TYPE_HOP_TABLE = 9, | ||
426 | MFIE_TYPE_REQUEST = 10, | ||
427 | MFIE_TYPE_CHALLENGE = 16, | ||
428 | MFIE_TYPE_POWER_CONSTRAINT = 32, | ||
429 | MFIE_TYPE_POWER_CAPABILITY = 33, | ||
430 | MFIE_TYPE_TPC_REQUEST = 34, | ||
431 | MFIE_TYPE_TPC_REPORT = 35, | ||
432 | MFIE_TYPE_SUPP_CHANNELS = 36, | ||
433 | MFIE_TYPE_CSA = 37, | ||
434 | MFIE_TYPE_MEASURE_REQUEST = 38, | ||
435 | MFIE_TYPE_MEASURE_REPORT = 39, | ||
436 | MFIE_TYPE_QUIET = 40, | ||
437 | MFIE_TYPE_IBSS_DFS = 41, | ||
438 | MFIE_TYPE_ERP_INFO = 42, | ||
439 | MFIE_TYPE_RSN = 48, | ||
440 | MFIE_TYPE_RATES_EX = 50, | ||
441 | MFIE_TYPE_GENERIC = 221, | ||
442 | MFIE_TYPE_QOS_PARAMETER = 222, | ||
443 | }; | ||
444 | |||
445 | struct ieee80211_hdr_1addr { | 344 | struct ieee80211_hdr_1addr { |
446 | __le16 frame_ctl; | 345 | __le16 frame_ctl; |
447 | __le16 duration_id; | 346 | __le16 duration_id; |