summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-27 14:38:07 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-04-08 09:16:58 +0200
commit79ba1d8910f517c3bd39d794ddb1a5b4c03795c4 (patch)
treefaff88285c710cacce1c04beda8074b57b17801a /net/mac80211/ieee80211_i.h
parent1946bed95707ef75d85e94ebe106ce7a119ca831 (diff)
mac80211: parse Timeout Interval Element using a struct
Instead of open-coding the accesses and length check do the length check in the IE parser and assign a struct pointer for use in the remaining code. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 6ad019d3262..c783e996bcc 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1180,7 +1180,7 @@ struct ieee802_11_elems {
const struct ieee80211_channel_sw_ie *ch_switch_ie;
const u8 *country_elem;
const u8 *pwr_constr_elem;
- const u8 *timeout_int;
+ const struct ieee80211_timeout_interval_ie *timeout_int;
const u8 *opmode_notif;
/* length of them, respectively */
@@ -1198,7 +1198,6 @@ struct ieee802_11_elems {
u8 prep_len;
u8 perr_len;
u8 country_elem_len;
- u8 timeout_int_len;
/* whether a parse error occurred while retrieving these elements */
bool parse_error;