svn commit: r215815 - stable/8/sys/net80211

[Bernhard Schmidt]

Author: bschmidt
Date: Thu Nov 25 08:55:57 2010
New Revision: 215815
URL: http://svn.freebsd.org/changeset/base/215815

Log:
  MFC r215699:
  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.

Modified:
  stable/8/sys/net80211/ieee80211_scan_sta.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- stable/8/sys/net80211/ieee80211_scan_sta.c	Thu Nov 25 07:02:36 2010	(r215814)
+++ stable/8/sys/net80211/ieee80211_scan_sta.c	Thu Nov 25 08:55:57 2010	(r215815)
@@ -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))