PERFORCE change 114519 for review

[Sam Leffler]

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

Change 114519 by sam at sam_ebb on 2007/02/14 23:06:03

	reject stations re-associating with a mismatch'd slot time setting
	Obtained from:	Atheros

Affected files ...

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

Differences ...

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

@@ -2616,6 +2616,16 @@
 			    "capability", capinfo);
 			return;
 		}
+		/*
+		 * Disallow re-associate w/ invalid slot time setting.
+		 */
+		if (ni->ni_associd != 0 &&
+		    IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan) &&
+		    ((ni->ni_capinfo ^ capinfo) & IEEE80211_CAPINFO_SHORT_SLOTTIME)) {
+			capinfomismatch(ni, wh, reassoc, resp,
+			    "slot time", capinfo);
+			return;
+		}
 		rate = ieee80211_setup_rates(ni, rates, xrates,
 				IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |
 				IEEE80211_F_DONEGO | IEEE80211_F_DODEL);