d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up setting the short preamble bit in the rate - this way it

Browse Source 
is very obvious (and cleanly so) that it occurs for non-11n rates.
This commit is contained in:
Adrian Chadd 2011-03-22 13:39:00 +00:00
parent 27ab76d69c
commit 1198947acd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/ath/if_ath_tx_ht.c
View File

@ -143,9 +143,6 @@ ath_rateseries_setup(struct ath_softc *sc, struct ieee80211_node *ni,
#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 *sc, struct ieee80211_node *ni,
, 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);
}