From b2edeea7fb0768cbc4baf21c61f4780e3f7091b2 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Wed, 21 Jan 2009 02:53:00 +0000 Subject: [PATCH] correct typo that left programmed sifs time in the slot time (to be applied on subsequent resets) Submitted by: Jiri Fojtasek --- sys/dev/ath/ath_hal/ar5211/ar5211_misc.c | 4 ++-- sys/dev/ath/ath_hal/ar5212/ar5212_misc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c b/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c index 519721236cd9..b16b4b8e01c0 100644 --- a/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c +++ b/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_misc.c,v 1.7 2008/11/27 22:29:52 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -432,7 +432,7 @@ ar5211SetSifsTime(struct ath_hal *ah, u_int us) } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } } diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c b/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c index 637f94e57ae0..fa4f1ab23092 100644 --- a/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c +++ b/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c @@ -453,7 +453,7 @@ ar5212SetSifsTime(struct ath_hal *ah, u_int us) } else { /* convert to system clocks */ OS_REG_WRITE(ah, AR_D_GBL_IFS_SIFS, ath_hal_mac_clks(ah, us)); - ahp->ah_slottime = us; + ahp->ah_sifstime = us; return AH_TRUE; } }