diff options
| author | adrian <adrian@FreeBSD.org> | 2011-02-17 17:35:09 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2011-02-17 17:35:09 +0000 |
| commit | 9859f69ffb3576bf30fc0d502a6ac9a871a6228d (patch) | |
| tree | 188ba927f06929d8e84817e93ed8f0bb77e64f9a /sys | |
| parent | 4376b03d9a6b37c85dabb71bf2a1b524322f4dcc (diff) | |
| download | FreeBSD-src-9859f69ffb3576bf30fc0d502a6ac9a871a6228d.zip FreeBSD-src-9859f69ffb3576bf30fc0d502a6ac9a871a6228d.tar.gz | |
Just be double-sure short-gi isn't being enabled in 20mhz mode.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ath/if_ath_tx_ht.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c index d03e963..580d5c2 100644 --- a/sys/dev/ath/if_ath_tx_ht.c +++ b/sys/dev/ath/if_ath_tx_ht.c @@ -119,8 +119,13 @@ ath_rateseries_setup(struct ath_softc *sc, struct ieee80211_node *ni, 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 */ |
