PERFORCE change 114940 for review

[Sam Leffler]

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

Change 114940 by sam at sam_ebb on 2007/02/24 00:19:28

	split up rate set checks so we uniquely identify whether the
	basic rate set was wrong or this was an 11b station trying to
	join a purge bss

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#91 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#91 (text+ko) ====

@@ -2630,14 +2630,17 @@
 		rate = ieee80211_setup_rates(ni, rates, xrates,
 				IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |
 				IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
+		if (rate & IEEE80211_RATE_BASIC) {
+			ratesetmismatch(ni, wh, reassoc, resp, "basic", rate);
+			return;
+		}
 		/*
 		 * If constrained to 11g-only stations reject an
 		 * 11b-only station.  We cheat a bit here by looking
 		 * at the max negotiated xmit rate and assuming anyone
 		 * with a best rate <24Mb/s is an 11b station.
 		 */
-		if ((rate & IEEE80211_RATE_BASIC) ||
-		    ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48)) {
+		if ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48) {
 			ratesetmismatch(ni, wh, reassoc, resp, "11g", rate);
 			return;
 		}