Author: adrian Date: Fri Mar 25 04:15:30 2011 New Revision: 219981 URL: http://svn.freebsd.org/changeset/base/219981
Log: Re-disable the setting of 2040/shortgi bits for now. This seems to work fine for STA but not HT/20 AP mode. Further discussion with net80211 people will need to take place to ensure that the right flags are set based on the negotiated capabilities of the remote peer, rather than whatever the local parameters are. Sending short-gi frames in 20mhz may work on some chips but it certainly isn't supported on anything currently supported by the HAL; and sending HT40 frames in HT20 mode just plain won't 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 Fri Mar 25 00:45:24 2011 (r219980) +++ head/sys/dev/ath/if_ath_tx_ht.c Fri Mar 25 04:15:30 2011 (r219981) @@ -129,9 +129,9 @@ 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; - /* * The hardware only supports short-gi in 40mhz mode - * if later hardware supports it in 20mhz mode, be sure @@ -139,6 +139,7 @@ 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; _______________________________________________ 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"