PERFORCE change 150896 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=150896

Change 150896 by sam at sam_ebb on 2008/10/03 21:18:56

	expand the ie blob before calling match_bss so it can potentially
	use the enumerated ie's

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#26 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#26 (text+ko) ====

@@ -107,16 +107,16 @@
  * contents explains why.  The following flags are or'd to to this
  * mask and can be used to figure out why the entry was rejected.
  */
-#define	MATCH_CHANNEL	0x001	/* channel mismatch */
-#define	MATCH_CAPINFO	0x002	/* capabilities mismatch, e.g. no ess */
-#define	MATCH_PRIVACY	0x004	/* privacy mismatch */
-#define	MATCH_RATE	0x008	/* rate set mismatch */
-#define	MATCH_SSID	0x010	/* ssid mismatch */
-#define	MATCH_BSSID	0x020	/* bssid mismatch */
-#define	MATCH_FAILS	0x040	/* too many failed auth attempts */
-#define	MATCH_NOTSEEN	0x080	/* not seen in recent scans */
-#define	MATCH_RSSI	0x100	/* rssi deemed too low to use */
-#define	MATCH_CC	0x200	/* country code mismatch */
+#define	MATCH_CHANNEL		0x0001	/* channel mismatch */
+#define	MATCH_CAPINFO		0x0002	/* capabilities mismatch, e.g. no ess */
+#define	MATCH_PRIVACY		0x0004	/* privacy mismatch */
+#define	MATCH_RATE		0x0008	/* rate set mismatch */
+#define	MATCH_SSID		0x0010	/* ssid mismatch */
+#define	MATCH_BSSID		0x0020	/* bssid mismatch */
+#define	MATCH_FAILS		0x0040	/* too many failed auth attempts */
+#define	MATCH_NOTSEEN		0x0080	/* not seen in recent scans */
+#define	MATCH_RSSI		0x0100	/* rssi deemed too low to use */
+#define	MATCH_CC		0x0200	/* country code mismatch */
 static int match_bss(struct ieee80211vap *,
 	const struct ieee80211_scan_state *, struct sta_entry *, int);
 static void adhoc_age(struct ieee80211_scan_state *);
@@ -992,8 +992,8 @@
 	    "macaddr          bssid         chan  rssi  rate flag  wep  essid");
 	mtx_lock(&st->st_lock);
 	TAILQ_FOREACH(se, &st->st_entry, se_list) {
+		ieee80211_ies_expand(&se->base.se_ies);
 		if (match_bss(vap, ss, se, debug) == 0) {
-			ieee80211_ies_expand(&se->base.se_ies);
 			if (selbs == NULL)
 				selbs = se;
 			else if (sta_compare(se, selbs) > 0)