Date: Thu, 29 Jan 2009 23:21:38 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r187902 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54... Message-ID: <200901292321.n0TNLcRV068103@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Thu Jan 29 23:21:38 2009 New Revision: 187902 URL: http://svn.freebsd.org/changeset/base/187902 Log: merge r187898: set ni_txparms for static turbo mode Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) projects/vap7/sys/net80211/ieee80211_node.c Modified: projects/vap7/sys/net80211/ieee80211_node.c ============================================================================== --- projects/vap7/sys/net80211/ieee80211_node.c Thu Jan 29 23:19:47 2009 (r187901) +++ projects/vap7/sys/net80211/ieee80211_node.c Thu Jan 29 23:21:38 2009 (r187902) @@ -227,20 +227,25 @@ static void node_setuptxparms(struct ieee80211_node *ni) { struct ieee80211vap *vap = ni->ni_vap; + enum ieee80211_phymode mode; if (ni->ni_flags & IEEE80211_NODE_HT) { if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) - ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11NA]; + mode = IEEE80211_MODE_11NA; else - ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11NG]; + mode = IEEE80211_MODE_11NG; } else { /* legacy rate handling */ - if (IEEE80211_IS_CHAN_A(ni->ni_chan)) - ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11A]; + /* 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_A(ni->ni_chan)) + mode = IEEE80211_MODE_11A; else if (ni->ni_flags & IEEE80211_NODE_ERP) - ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11G]; + mode = IEEE80211_MODE_11G; else - ni->ni_txparms = &vap->iv_txparms[IEEE80211_MODE_11B]; + mode = IEEE80211_MODE_11B; } + ni->ni_txparms = &vap->iv_txparms[mode]; } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901292321.n0TNLcRV068103>