svn commit: r219962 - head/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Thu Mar 24 16:06:54 2011
New Revision: 219962
URL: http://svn.freebsd.org/changeset/base/219962

Log:
  Flip back HT/40 and Short-GI (for 40mhz operation). These are now verified to work.

Modified:
  head/sys/dev/ath/if_ath_tx_ht.c

Modified: head/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx_ht.c	Thu Mar 24 15:27:15 2011	(r219961)
+++ head/sys/dev/ath/if_ath_tx_ht.c	Thu Mar 24 16:06:54 2011	(r219962)
@@ -129,7 +129,6 @@ ath_rateseries_setup(struct ath_softc *s
 		if (flags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA))
 			series[i].RateFlags |= HAL_RATESERIES_RTS_CTS;
 
-#if 0
 		if (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40)
 			series[i].RateFlags |= HAL_RATESERIES_2040;
 
@@ -140,7 +139,6 @@ ath_rateseries_setup(struct ath_softc *s
 		 */
 		if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40)
 			series[i].RateFlags |= HAL_RATESERIES_HALFGI;
-#endif
 
 		series[i].Rate = rt->info[rix[i]].rateCode;