PERFORCE change 116130 for review

[Sepherosa Ziehau]

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

Change 116130 by sephe at sephe_zealot:sam_wifi on 2007/03/19 10:56:26

	Correct the condition of setting short slot time subfield in
	assoc/reassoc req, so shslot-capable NIC will not be counted
	as shslot-encapable NIC.
	
	Reviewed-by: sam@

Affected files ...

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

Differences ...

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

@@ -1765,7 +1765,7 @@
 		if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) &&
 		    IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan))
 			capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE;
-		if ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) &&
+		if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
 		    (ic->ic_caps & IEEE80211_C_SHSLOT))
 			capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME;
 		*(u_int16_t *)frm = htole16(capinfo);