diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 327aabc07abe..06b3411530f2 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -247,6 +247,9 @@ struct ieee80211_mgd_work { | |||
247 | 247 | ||
248 | int tries; | 248 | int tries; |
249 | 249 | ||
250 | u8 key[WLAN_KEY_LEN_WEP104]; | ||
251 | u8 key_len, key_idx; | ||
252 | |||
250 | /* must be last */ | 253 | /* must be last */ |
251 | u8 ie[0]; /* for auth or assoc frame, not probe */ | 254 | u8 ie[0]; /* for auth or assoc frame, not probe */ |
252 | }; | 255 | }; |
@@ -321,6 +324,7 @@ struct ieee80211_if_ibss { | |||
321 | 324 | ||
322 | bool fixed_bssid; | 325 | bool fixed_bssid; |
323 | bool fixed_channel; | 326 | bool fixed_channel; |
327 | bool privacy; | ||
324 | 328 | ||
325 | u8 bssid[ETH_ALEN]; | 329 | u8 bssid[ETH_ALEN]; |
326 | u8 ssid[IEEE80211_MAX_SSID_LEN]; | 330 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
@@ -1093,8 +1097,8 @@ int ieee80211_add_pending_skbs(struct ieee80211_local *local, | |||
1093 | 1097 | ||
1094 | void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, | 1098 | void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, |
1095 | u16 transaction, u16 auth_alg, | 1099 | u16 transaction, u16 auth_alg, |
1096 | u8 *extra, size_t extra_len, | 1100 | u8 *extra, size_t extra_len, const u8 *bssid, |
1097 | const u8 *bssid, int encrypt); | 1101 | const u8 *key, u8 key_len, u8 key_idx); |
1098 | int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, | 1102 | int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, |
1099 | const u8 *ie, size_t ie_len); | 1103 | const u8 *ie, size_t ie_len); |
1100 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | 1104 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, |