PERFORCE change 46332 for review

[Sam Leffler]

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

Change 46332 by sam at 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 "