diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ad12c2a03a95..7b96d95f48b1 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -256,6 +256,7 @@ struct mesh_preq_queue { | |||
256 | #define IEEE80211_STA_TKIP_WEP_USED BIT(14) | 256 | #define IEEE80211_STA_TKIP_WEP_USED BIT(14) |
257 | #define IEEE80211_STA_CSA_RECEIVED BIT(15) | 257 | #define IEEE80211_STA_CSA_RECEIVED BIT(15) |
258 | #define IEEE80211_STA_MFP_ENABLED BIT(16) | 258 | #define IEEE80211_STA_MFP_ENABLED BIT(16) |
259 | #define IEEE80211_STA_EXT_SME BIT(17) | ||
259 | /* flags for MLME request */ | 260 | /* flags for MLME request */ |
260 | #define IEEE80211_STA_REQ_SCAN 0 | 261 | #define IEEE80211_STA_REQ_SCAN 0 |
261 | #define IEEE80211_STA_REQ_DIRECT_PROBE 1 | 262 | #define IEEE80211_STA_REQ_DIRECT_PROBE 1 |
@@ -266,6 +267,7 @@ struct mesh_preq_queue { | |||
266 | #define IEEE80211_AUTH_ALG_OPEN BIT(0) | 267 | #define IEEE80211_AUTH_ALG_OPEN BIT(0) |
267 | #define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1) | 268 | #define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1) |
268 | #define IEEE80211_AUTH_ALG_LEAP BIT(2) | 269 | #define IEEE80211_AUTH_ALG_LEAP BIT(2) |
270 | #define IEEE80211_AUTH_ALG_FT BIT(3) | ||
269 | 271 | ||
270 | struct ieee80211_if_managed { | 272 | struct ieee80211_if_managed { |
271 | struct timer_list timer; | 273 | struct timer_list timer; |
@@ -335,6 +337,9 @@ struct ieee80211_if_managed { | |||
335 | size_t ie_deauth_len; | 337 | size_t ie_deauth_len; |
336 | u8 *ie_disassoc; | 338 | u8 *ie_disassoc; |
337 | size_t ie_disassoc_len; | 339 | size_t ie_disassoc_len; |
340 | |||
341 | u8 *sme_auth_ie; | ||
342 | size_t sme_auth_ie_len; | ||
338 | }; | 343 | }; |
339 | 344 | ||
340 | enum ieee80211_ibss_flags { | 345 | enum ieee80211_ibss_flags { |
@@ -970,7 +975,7 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, | |||
970 | struct sk_buff *skb, | 975 | struct sk_buff *skb, |
971 | struct ieee80211_rx_status *rx_status); | 976 | struct ieee80211_rx_status *rx_status); |
972 | int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, | 977 | int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, |
973 | char *ie, size_t len); | 978 | const char *ie, size_t len); |
974 | 979 | ||
975 | void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local); | 980 | void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local); |
976 | void ieee80211_scan_failed(struct ieee80211_local *local); | 981 | void ieee80211_scan_failed(struct ieee80211_local *local); |