Author: bschmidt
Date: Mon Nov 22 19:01:47 2010
New Revision: 215699
URL: http://svn.freebsd.org/changeset/base/215699
Log:
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
Modified:
head/sys/net80211/ieee80211_scan_sta.c
Modified: head/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sta.c Mon Nov 22 18:29:00 2010
(r215698)
+++ head/sys/net80211/ieee80211_scan_sta.c Mon Nov 22 19:01:47 2010
(r215699)
@@ -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))
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
