PERFORCE change 87498 for review

[Sam Leffler]

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

Change 87498 by sam at sam_ebb on 2005/11/30 04:03:07

	update only the slot time capability based on rcvd beacons;
	was copying all of capinfo

Affected files ...

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

Differences ...

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

@@ -2127,7 +2127,8 @@
 				ieee80211_set_shortslottime(ic,
 					IEEE80211_IS_CHAN_A(ic->ic_bsschan) ||
 					(scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME));
-				ni->ni_capinfo = scan.capinfo;
+				ni->ni_capinfo = (ni->ni_capinfo &~ IEEE80211_CAPINFO_SHORT_SLOTTIME)
+					       | (scan.capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME);
 				/* XXX statistic */
 			}
 			if (scan.wme != NULL &&