From owner-p4-projects@FreeBSD.ORG  Fri Jul 22 00:34:33 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF32816A458; Fri, 22 Jul 2005 00:34:32 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3942616A420
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:34:32 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A74443D49
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:34:28 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6M0YScf034013
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:34:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6M0YRPt034008
	for perforce@freebsd.org; Fri, 22 Jul 2005 00:34:27 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 22 Jul 2005 00:34:27 GMT
Message-Id: <200507220034.j6M0YRPt034008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80724 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jul 2005 00:34:34 -0000

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

Change 80724 by sam@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);