diff options
| author | adrian <adrian@FreeBSD.org> | 2011-02-21 03:52:51 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2011-02-21 03:52:51 +0000 |
| commit | dd94fa571e4ed1581d24b4c60f5af27154c3b00d (patch) | |
| tree | 885ae252ed929b4c8d9fbf68a55c8ad503016931 | |
| parent | ec126fb1922f9144cfe28bf3b40abe88305111aa (diff) | |
| download | FreeBSD-src-dd94fa571e4ed1581d24b4c60f5af27154c3b00d.zip FreeBSD-src-dd94fa571e4ed1581d24b4c60f5af27154c3b00d.tar.gz | |
Implement setting the short preamble bit if it's needed for the current node.
Short preamble rates are only for legacy rates; MCS rate codes don't have a short
preamble code like this.
| -rw-r--r-- | sys/dev/ath/if_ath_tx_ht.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c index 580d5c2..b0948c1 100644 --- a/sys/dev/ath/if_ath_tx_ht.c +++ b/sys/dev/ath/if_ath_tx_ht.c @@ -103,7 +103,6 @@ ath_rateseries_setup(struct ath_softc *sc, struct ieee80211_node *ni, HAL_BOOL shortPreamble = AH_FALSE; const HAL_RATE_TABLE *rt = sc->sc_currates; int i; - uint8_t txrate; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)) @@ -111,7 +110,6 @@ ath_rateseries_setup(struct ath_softc *sc, struct ieee80211_node *ni, memset(series, 0, sizeof(HAL_11N_RATE_SERIES) * 4); for (i = 0; i < 4; i++) { - txrate = rt->info[rix[i]].rateCode; series[i].Tries = try[i]; series[i].ChSel = sc->sc_txchainmask; if (ic->ic_protmode == IEEE80211_PROT_RTSCTS || @@ -128,14 +126,16 @@ ath_rateseries_setup(struct ath_softc *sc, struct ieee80211_node *ni, 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 */ - series[i].Rate = txrate; + 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 (txrate & IEEE80211_RATE_MCS) { + if (series[i].Rate & IEEE80211_RATE_MCS) { series[i].PktDuration = ath_computedur_ht(pktlen - , txrate + , series[i].Rate , ic->ic_txstream , (ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) , series[i].RateFlags & HAL_RATESERIES_HALFGI); |
