summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2009-06-11 17:09:39 +0000
committersam <sam@FreeBSD.org>2009-06-11 17:09:39 +0000
commit4c6bb21c7ffef1862a7099cb8b8d97cbc04b3090 (patch)
treef381429dd1bff990832d0a3574a789baaa3a81d0 /sys/net80211
parent4c69d78e3437c4a680aa43dd0b7ceeddddc6e0ee (diff)
downloadFreeBSD-src-4c6bb21c7ffef1862a7099cb8b8d97cbc04b3090.zip
FreeBSD-src-4c6bb21c7ffef1862a7099cb8b8d97cbc04b3090.tar.gz
use negotiated short gi to calculate the tx rate; using the htcaps
does not take into account local state (e.g. manual disable of sgi)
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index a34cdd0..7712b04 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -403,12 +403,12 @@ get_sta_info(void *arg, struct ieee80211_node *ni)
const struct ieee80211_mcs_rates *mcs =
&ieee80211_htrates[ni->ni_txrate &~ IEEE80211_RATE_MCS];
if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) {
- if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40)
+ if (ni->ni_flags & IEEE80211_NODE_SGI40)
si->isi_txmbps = mcs->ht40_rate_800ns;
else
si->isi_txmbps = mcs->ht40_rate_400ns;
} else {
- if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20)
+ if (ni->ni_flags & IEEE80211_NODE_SGI20)
si->isi_txmbps = mcs->ht20_rate_800ns;
else
si->isi_txmbps = mcs->ht20_rate_400ns;
OpenPOWER on IntegriCloud