Date: Tue, 22 Mar 2011 13:39:00 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219870 - head/sys/dev/ath Message-ID: <201103221339.p2MDd0PH061168@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Tue Mar 22 13:39:00 2011 New Revision: 219870 URL: http://svn.freebsd.org/changeset/base/219870 Log: Clean up setting the short preamble bit in the rate - this way it is very obvious (and cleanly so) that it occurs for non-11n rates. 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 Tue Mar 22 13:35:56 2011 (r219869) +++ head/sys/dev/ath/if_ath_tx_ht.c Tue Mar 22 13:39:00 2011 (r219870) @@ -143,9 +143,6 @@ ath_rateseries_setup(struct ath_softc *s #endif series[i].Rate = rt->info[rix[i]].rateCode; - /* the short preamble field is only applicable for non-MCS rates */ - if (shortPreamble && ! (series[i].Rate & IEEE80211_RATE_MCS)) - series[i].Rate |= rt->info[rix[i]].shortPreamble; /* PktDuration doesn't include slot, ACK, RTS, etc timing - it's just the packet duration */ if (series[i].Rate & IEEE80211_RATE_MCS) { @@ -156,6 +153,8 @@ ath_rateseries_setup(struct ath_softc *s , series[i].RateFlags & HAL_RATESERIES_2040 , series[i].RateFlags & HAL_RATESERIES_HALFGI); } else { + if (shortPreamble) + series[i].Rate |= rt->info[rix[i]].shortPreamble; series[i].PktDuration = ath_hal_computetxtime(ah, rt, pktlen, rix[i], shortPreamble); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103221339.p2MDd0PH061168>