PERFORCE change 80724 for review

[Sam Leffler]

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

Change 80724 by sam at sam_ebb on 2005/07/22 00:33:29

	fix check that caused DSPARMS ie to not be included in beacon frames

Affected files ...

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

Differences ...

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

@@ -1444,7 +1444,7 @@
 				ic->ic_bss->ni_esslen);
 		frm = ieee80211_add_rates(frm, &ni->ni_rates);
 
-		if (ic->ic_phytype == IEEE80211_T_FH) {
+		if (IEEE80211_IS_CHAN_FHSS(ic->ic_curchan)) {
                         *frm++ = IEEE80211_ELEMID_FHPARMS;
                         *frm++ = 5;
                         *frm++ = ni->ni_fhdwell & 0x00ff;
@@ -1789,7 +1789,7 @@
 	} else
 		*frm++ = 0;
 	frm = ieee80211_add_rates(frm, rs);
-	if (IEEE80211_IS_CHAN_FHSS(ic->ic_bsschan)) {
+	if (!IEEE80211_IS_CHAN_FHSS(ic->ic_bsschan)) {
 		*frm++ = IEEE80211_ELEMID_DSPARMS;
 		*frm++ = 1;
 		*frm++ = ieee80211_chan2ieee(ic, ic->ic_bsschan);