Date: Thu, 11 Jun 2009 17:09:39 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r194021 - head/sys/net80211 Message-ID: <200906111709.n5BH9dA9054274@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Thu Jun 11 17:09:39 2009 New Revision: 194021 URL: http://svn.freebsd.org/changeset/base/194021 Log: 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) Modified: head/sys/net80211/ieee80211_ioctl.c Modified: head/sys/net80211/ieee80211_ioctl.c ============================================================================== --- head/sys/net80211/ieee80211_ioctl.c Thu Jun 11 17:06:58 2009 (r194020) +++ head/sys/net80211/ieee80211_ioctl.c Thu Jun 11 17:09:39 2009 (r194021) @@ -403,12 +403,12 @@ get_sta_info(void *arg, struct ieee80211 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906111709.n5BH9dA9054274>