Author: adrian
Date: Thu Feb 17 17:35:09 2011
New Revision: 218779
URL: http://svn.freebsd.org/changeset/base/218779

Log:
  Just be double-sure short-gi isn't being enabled in 20mhz mode.

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 Feb 17 17:31:36 2011        
(r218778)
+++ head/sys/dev/ath/if_ath_tx_ht.c     Thu Feb 17 17:35:09 2011        
(r218779)
@@ -119,8 +119,13 @@ ath_rateseries_setup(struct ath_softc *s
                        series[i].RateFlags |= HAL_RATESERIES_RTS_CTS;
                if (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40)
                        series[i].RateFlags |= HAL_RATESERIES_2040;
-               if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20 ||
-                   ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40)
+
+               /*
+                * The hardware only supports short-gi in 40mhz mode -
+                * if later hardware supports it in 20mhz mode, be sure
+                * to add the relevant check here.
+                */
+               if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40)
                        series[i].RateFlags |= HAL_RATESERIES_HALFGI;
 
                /* XXX should this check the short preamble value should be set 
for legacy rates? -adrian */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to