diff options
author | Antonio Quartulli <ordex@autistici.org> | 2012-09-07 07:28:52 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-07 07:50:34 -0400 |
commit | 6ae16775d6bcd57e64100fda78fd01c8e7e7f08d (patch) | |
tree | 0708f5ad00a7622c9298609c860e6cc76873c6e7 /net/mac80211/ieee80211_i.h | |
parent | 316b6b5df77db801d62ec381cfae0c38ff84252c (diff) |
mac80211: move ieee80211_send_deauth_disassoc outside mlme code
Move ieee80211_send_deauth_disassoc() to util.c to make it
available for the rest of the mac80211 code.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
[reword commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index b95fa256d438..887452327ba8 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -68,6 +68,8 @@ struct ieee80211_local; | |||
68 | #define IEEE80211_DEFAULT_MAX_SP_LEN \ | 68 | #define IEEE80211_DEFAULT_MAX_SP_LEN \ |
69 | IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL | 69 | IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL |
70 | 70 | ||
71 | #define IEEE80211_DEAUTH_FRAME_LEN (24 /* hdr */ + 2 /* reason */) | ||
72 | |||
71 | struct ieee80211_fragment_entry { | 73 | struct ieee80211_fragment_entry { |
72 | unsigned long first_frag_time; | 74 | unsigned long first_frag_time; |
73 | unsigned int seq; | 75 | unsigned int seq; |
@@ -1458,6 +1460,9 @@ void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, | |||
1458 | u16 transaction, u16 auth_alg, | 1460 | u16 transaction, u16 auth_alg, |
1459 | u8 *extra, size_t extra_len, const u8 *bssid, | 1461 | u8 *extra, size_t extra_len, const u8 *bssid, |
1460 | const u8 *da, const u8 *key, u8 key_len, u8 key_idx); | 1462 | const u8 *da, const u8 *key, u8 key_len, u8 key_idx); |
1463 | void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, | ||
1464 | const u8 *bssid, u16 stype, u16 reason, | ||
1465 | bool send_frame, u8 *frame_buf); | ||
1461 | int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, | 1466 | int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, |
1462 | const u8 *ie, size_t ie_len, | 1467 | const u8 *ie, size_t ie_len, |
1463 | enum ieee80211_band band, u32 rate_mask, | 1468 | enum ieee80211_band band, u32 rate_mask, |