summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-27 14:30:12 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-04-08 09:16:56 +0200
commit1cd8e88e17729f57a9c7f751103e522596bb5de2 (patch)
treec20e4a7bed65480cea84f6a38bb4d0d44dd115f0 /net/mac80211/mesh.c
parenta6dfba841c4d38312115dc6b08d86cc496af7e88 (diff)
downloadtalos-op-linux-1cd8e88e17729f57a9c7f751103e522596bb5de2.tar.gz
talos-op-linux-1cd8e88e17729f57a9c7f751103e522596bb5de2.zip
mac80211: check DSSS params 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/mesh.c')
-rw-r--r--net/mac80211/mesh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index aead5410c622..0acc2874d294 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -907,7 +907,7 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
(!elems.rsn && sdata->u.mesh.security != IEEE80211_MESH_SEC_NONE))
return;
- if (elems.ds_params && elems.ds_params_len == 1)
+ if (elems.ds_params)
freq = ieee80211_channel_to_frequency(elems.ds_params[0], band);
else
freq = rx_status->freq;
OpenPOWER on IntegriCloud