svn commit: r187848 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Wed Jan 28 19:34:40 2009
New Revision: 187848
URL: http://svn.freebsd.org/changeset/base/187848

Log:
  merge r187510: correct typo that left programmed sifs time in the slot time

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)

Modified: projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c
==============================================================================
--- projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c	Wed Jan 28 19:32:19 2009	(r187847)
+++ projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c	Wed Jan 28 19:34:40 2009	(r187848)
@@ -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_
 	} 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;
 	}
 }

Modified: projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Wed Jan 28 19:32:19 2009	(r187847)
+++ projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Wed Jan 28 19:34:40 2009	(r187848)
@@ -453,7 +453,7 @@ ar5212SetSifsTime(struct ath_hal *ah, u_
 	} 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;
 	}
 }