From owner-p4-projects@FreeBSD.ORG  Sun Feb  1 17:46:32 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A76E916A4D0; Sun,  1 Feb 2004 17:46:31 -0800 (PST)
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 7F44C16A4CE
	for <perforce@freebsd.org>; Sun,  1 Feb 2004 17:46:31 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 917D043D2D
	for <perforce@freebsd.org>; Sun,  1 Feb 2004 17:46:30 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i121kU0B069768
	for <perforce@freebsd.org>; Sun, 1 Feb 2004 17:46:30 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i121kUph069765
	for perforce@freebsd.org; Sun, 1 Feb 2004 17:46:30 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sun, 1 Feb 2004 17:46:30 -0800 (PST)
Message-Id: <200402020146.i121kUph069765@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 46332 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: Mon, 02 Feb 2004 01:46:32 -0000

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

Change 46332 by sam@sam_ebb on 2004/02/01 17:46:14

	add non-ap slot time setup

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#25 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#25 (text+ko) ====

@@ -104,6 +104,7 @@
 static void	ath_bmiss_proc(void *, int);
 static void	ath_initkeytable(struct ath_softc *);
 static void	ath_mode_init(struct ath_softc *);
+static void	ath_setslottime(struct ath_softc *);
 static int	ath_beacon_alloc(struct ath_softc *, struct ieee80211_node *);
 static void	ath_beacon_proc(struct ath_softc *);
 static void	ath_beacon_free(struct ath_softc *);
@@ -1079,8 +1080,9 @@
 	rfilt = ath_calcrxfilter(sc);
 	ath_hal_setrxfilter(ah, rfilt);
 
-	/* configure operational mode */
+	/* configure operational mode and slot time */
 	ath_hal_setopmode(ah);
+	ath_setslottime(sc);
 
 	/* calculate and install multicast filter */
 	if ((ifp->if_flags & IFF_ALLMULTI) == 0) {
@@ -1232,7 +1234,6 @@
 		bf->bf_m = m;
 	else
 		m_freem(m);
-	ath_setslottime(sc);		/* initialize slot time state */
 	return error;
 }
 
@@ -2720,6 +2721,8 @@
 			if (ath_hal_keyisvalid(ah, i))
 				ath_hal_keysetmac(ah, i, bssid);
 	}
+	if ((ic->ic_flags ^ sc->sc_icflags) & IEEE80211_F_SHSLOT)
+		ath_setslottime(sc);
 
 	if (nstate == IEEE80211_S_RUN) {
 		DPRINTF(ATH_DEBUG_ANY, ("%s(RUN): ic_flags=0x%08x iv=%d bssid=%s "