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>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 157d951df7a4..304d6cfc6250 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2629,10 +2629,10 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
 
         if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&
-            elems.timeout_int && elems.timeout_int_len == 5 &&
-            elems.timeout_int[0] == WLAN_TIMEOUT_ASSOC_COMEBACK) {
+            elems.timeout_int &&
+            elems.timeout_int->type == WLAN_TIMEOUT_ASSOC_COMEBACK) {
                 u32 tu, ms;
-                tu = get_unaligned_le32(elems.timeout_int + 1);
+                tu = le32_to_cpu(elems.timeout_int->value);
                 ms = tu * 1024 / 1000;
                 sdata_info(sdata,
                            "%pM rejected association temporarily; comeback duration %u TU (%u ms)\n",