From owner-p4-projects@FreeBSD.ORG  Fri Nov 12 00:44:17 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4BF3716A4D1; Fri, 12 Nov 2004 00:44:17 +0000 (GMT)
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 28DFC16A4CE
	for <perforce@freebsd.org>; Fri, 12 Nov 2004 00:44:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B4F843D45
	for <perforce@freebsd.org>; Fri, 12 Nov 2004 00:44:17 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAC0iGdA053030
	for <perforce@freebsd.org>; Fri, 12 Nov 2004 00:44:17 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAC0iGXT053027
	for perforce@freebsd.org; Fri, 12 Nov 2004 00:44:16 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 12 Nov 2004 00:44:16 GMT
Message-Id: <200411120044.iAC0iGXT053027@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>
Subject: PERFORCE change 64926 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 12 Nov 2004 00:44:18 -0000

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

Change 64926 by sam@sam_ebb on 2004/11/12 00:43:45

	correct handling of slot time for 11g adhoc mode

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#18 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#18 (text+ko) ====

@@ -1667,14 +1667,14 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 
 	/*
-	 * In station mode we change the hardware immediately.
-	 * For other operation we defer the change until beacon
-	 * updates have propagated to the stations.
+	 * When not coordinating the BSS, change the hardware
+	 * immediately.  For other operation we defer the change
+	 * until beacon updates have propagated to the stations.
 	 */
-	if (ic->ic_opmode == IEEE80211_M_STA)
+	if (ic->ic_opmode == IEEE80211_M_HOSTAP)
+		sc->sc_updateslot = UPDATE;
+	else
 		ath_setslottime(sc);
-	else
-		sc->sc_updateslot = UPDATE;
 }
 
 /*