summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-27 09:31:53 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-04-08 03:16:57 -0400
commit1946bed95707ef75d85e94ebe106ce7a119ca831 (patch)
treea0be226b4fed65ac75344222e70c2cdddb5b0888 /net/mac80211/mlme.c
parent1cd8e88e17729f57a9c7f751103e522596bb5de2 (diff)
mac80211: check ERP info IE length in parser
It's always just one byte, so check for that and remove the length field from the parser struct. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f76c58fb3bdc..157d951df7a4 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3038,7 +3038,7 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
3038 changed |= BSS_CHANGED_DTIM_PERIOD; 3038 changed |= BSS_CHANGED_DTIM_PERIOD;
3039 } 3039 }
3040 3040
3041 if (elems.erp_info && elems.erp_info_len >= 1) { 3041 if (elems.erp_info) {
3042 erp_valid = true; 3042 erp_valid = true;
3043 erp_value = elems.erp_info[0]; 3043 erp_value = elems.erp_info[0];
3044 } else { 3044 } else {