diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index b5d3f58a7845..747814f319af 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -292,17 +292,33 @@ struct mesh_config { | |||
292 | #define IEEE80211_STA_AUTO_BSSID_SEL BIT(11) | 292 | #define IEEE80211_STA_AUTO_BSSID_SEL BIT(11) |
293 | #define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12) | 293 | #define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12) |
294 | #define IEEE80211_STA_PRIVACY_INVOKED BIT(13) | 294 | #define IEEE80211_STA_PRIVACY_INVOKED BIT(13) |
295 | /* flags for MLME request*/ | ||
296 | #define IEEE80211_STA_REQ_SCAN 0 | ||
297 | #define IEEE80211_STA_REQ_AUTH 1 | ||
298 | #define IEEE80211_STA_REQ_RUN 2 | ||
299 | |||
300 | /* flags used for setting mlme state */ | ||
301 | enum ieee80211_sta_mlme_state { | ||
302 | IEEE80211_STA_MLME_DISABLED, | ||
303 | IEEE80211_STA_MLME_AUTHENTICATE, | ||
304 | IEEE80211_STA_MLME_ASSOCIATE, | ||
305 | IEEE80211_STA_MLME_ASSOCIATED, | ||
306 | IEEE80211_STA_MLME_IBSS_SEARCH, | ||
307 | IEEE80211_STA_MLME_IBSS_JOINED, | ||
308 | IEEE80211_STA_MLME_MESH_UP | ||
309 | }; | ||
310 | |||
311 | /* bitfield of allowed auth algs */ | ||
312 | #define IEEE80211_AUTH_ALG_OPEN BIT(0) | ||
313 | #define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1) | ||
314 | #define IEEE80211_AUTH_ALG_LEAP BIT(2) | ||
315 | |||
295 | struct ieee80211_if_sta { | 316 | struct ieee80211_if_sta { |
296 | struct timer_list timer; | 317 | struct timer_list timer; |
297 | struct work_struct work; | 318 | struct work_struct work; |
298 | u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN]; | 319 | u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN]; |
299 | u8 ssid[IEEE80211_MAX_SSID_LEN]; | 320 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
300 | enum { | 321 | enum ieee80211_sta_mlme_state state; |
301 | IEEE80211_DISABLED, IEEE80211_AUTHENTICATE, | ||
302 | IEEE80211_ASSOCIATE, IEEE80211_ASSOCIATED, | ||
303 | IEEE80211_IBSS_SEARCH, IEEE80211_IBSS_JOINED, | ||
304 | IEEE80211_MESH_UP | ||
305 | } state; | ||
306 | size_t ssid_len; | 322 | size_t ssid_len; |
307 | u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; | 323 | u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; |
308 | size_t scan_ssid_len; | 324 | size_t scan_ssid_len; |
@@ -352,13 +368,7 @@ struct ieee80211_if_sta { | |||
352 | unsigned long last_probe; | 368 | unsigned long last_probe; |
353 | 369 | ||
354 | unsigned int flags; | 370 | unsigned int flags; |
355 | #define IEEE80211_STA_REQ_SCAN 0 | ||
356 | #define IEEE80211_STA_REQ_AUTH 1 | ||
357 | #define IEEE80211_STA_REQ_RUN 2 | ||
358 | 371 | ||
359 | #define IEEE80211_AUTH_ALG_OPEN BIT(0) | ||
360 | #define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1) | ||
361 | #define IEEE80211_AUTH_ALG_LEAP BIT(2) | ||
362 | unsigned int auth_algs; /* bitfield of allowed auth algs */ | 372 | unsigned int auth_algs; /* bitfield of allowed auth algs */ |
363 | int auth_alg; /* currently used IEEE 802.11 authentication algorithm */ | 373 | int auth_alg; /* currently used IEEE 802.11 authentication algorithm */ |
364 | int auth_transaction; | 374 | int auth_transaction; |