diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2009-06-11 17:09:39 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2009-06-11 17:09:39 +0000 |
| commit | 6ac5ee4a22e498ed1a292f84c109ba4ac1387212 (patch) | |
| tree | f381429dd1bff990832d0a3574a789baaa3a81d0 /sys/net80211/ieee80211_ioctl.c | |
| parent | 7c6ee94f8c316a993a4850700a2db07d6c1cd39c (diff) | |
| download | src-6ac5ee4a22e498ed1a292f84c109ba4ac1387212.tar.gz src-6ac5ee4a22e498ed1a292f84c109ba4ac1387212.zip | |
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)
Notes
Notes:
svn path=/head/; revision=194021
Diffstat (limited to 'sys/net80211/ieee80211_ioctl.c')
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index a34cdd077fee..7712b04ad120 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; |