svn commit: r191015 - head/sys/net80211
Sam Leffler
sam at FreeBSD.org
Mon Apr 13 20:45:31 UTC 2009
Author: sam
Date: Mon Apr 13 20:45:29 2009
New Revision: 191015
URL: http://svn.freebsd.org/changeset/base/191015
Log:
fix txparms setup for 108G sta's: ieee80211_iserp_rateset does not
identify a station operating in turbo-boost mode because it has a
pure ofdm rate set; add an explicit check for the channel type
instead of depending on IEEE80211_NODE_ERP being set
Modified:
head/sys/net80211/ieee80211_node.c
Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c Mon Apr 13 20:19:28 2009 (r191014)
+++ head/sys/net80211/ieee80211_node.c Mon Apr 13 20:45:29 2009 (r191015)
@@ -237,16 +237,17 @@ node_setuptxparms(struct ieee80211_node
else
mode = IEEE80211_MODE_11NG;
} else { /* legacy rate handling */
- /* NB: 108A/108G should be handled as 11a/11g respectively */
if (IEEE80211_IS_CHAN_ST(ni->ni_chan))
mode = IEEE80211_MODE_STURBO_A;
else if (IEEE80211_IS_CHAN_HALF(ni->ni_chan))
mode = IEEE80211_MODE_HALF;
else if (IEEE80211_IS_CHAN_QUARTER(ni->ni_chan))
mode = IEEE80211_MODE_QUARTER;
+ /* NB: 108A should be handled as 11a */
else if (IEEE80211_IS_CHAN_A(ni->ni_chan))
mode = IEEE80211_MODE_11A;
- else if (ni->ni_flags & IEEE80211_NODE_ERP)
+ else if (IEEE80211_IS_CHAN_108G(ni->ni_chan) ||
+ (ni->ni_flags & IEEE80211_NODE_ERP))
mode = IEEE80211_MODE_11G;
else
mode = IEEE80211_MODE_11B;
More information about the svn-src-all
mailing list