aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorRui Paulo <rpaulo@gmail.com>2009-11-18 18:40:00 +0000
committerJohn W. Linville <linville@tuxdriver.com>2009-11-18 17:09:27 -0500
commit136cfa28615ccce0f9374811480e0b81c4191ea5 (patch)
tree9a07d6f316d19f85fd989b17e75d931f907c7d1a /net/mac80211/util.c
parentfe7a5d5c1ad659bf0ec7dc171e122aeefa16ac25 (diff)
downloadkernel_samsung_smdk4412-136cfa28615ccce0f9374811480e0b81c4191ea5.zip
kernel_samsung_smdk4412-136cfa28615ccce0f9374811480e0b81c4191ea5.tar.gz
kernel_samsung_smdk4412-136cfa28615ccce0f9374811480e0b81c4191ea5.tar.bz2
mac80211: use a structure to hold the mesh config information element
Signed-off-by: Rui Paulo <rpaulo@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 5ae1bf3..2fb0432 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -666,8 +666,8 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
elems->mesh_id_len = elen;
break;
case WLAN_EID_MESH_CONFIG:
- elems->mesh_config = pos;
- elems->mesh_config_len = elen;
+ if (elen >= sizeof(struct ieee80211_meshconf_ie))
+ elems->mesh_config = (void *)pos;
break;
case WLAN_EID_PEER_LINK:
elems->peer_link = pos;