summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbschmidt <bschmidt@FreeBSD.org>2010-11-22 19:01:47 +0000
committerbschmidt <bschmidt@FreeBSD.org>2010-11-22 19:01:47 +0000
commitb040c9742c99e20eb9926995bea03ad4f3e849c8 (patch)
tree5921758edf94d872d347f09293f199e946b81a73 /sys
parentbaef74520563dff454420fc45cbb65b465668325 (diff)
downloadFreeBSD-src-b040c9742c99e20eb9926995bea03ad4f3e849c8.zip
FreeBSD-src-b040c9742c99e20eb9926995bea03ad4f3e849c8.tar.gz
The meshid element is memcpy()'ed into se_meshid if included in either
beacon or probe-response frames. Fix the condition by checking for the the array's content instead of the always existing array itself. Reviewed by: rpaulo, stefanf MFC after: 3 days
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211_scan_sta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c
index a1d0c42..2611a6a 100644
--- a/sys/net80211/ieee80211_scan_sta.c
+++ b/sys/net80211/ieee80211_scan_sta.c
@@ -1013,7 +1013,7 @@ match_bss(struct ieee80211vap *vap,
*/
if (se->se_capinfo & (IEEE80211_CAPINFO_IBSS|IEEE80211_CAPINFO_ESS))
fail |= MATCH_CAPINFO;
- else if (&se->se_meshid == NULL)
+ else if (se->se_meshid[0] != IEEE80211_ELEMID_MESHID)
fail |= MATCH_MESH_NOID;
else if (ms->ms_idlen != 0 &&
match_id(se->se_meshid, ms->ms_id, ms->ms_idlen))
OpenPOWER on IntegriCloud