diff options
| author | Bernhard Schmidt <bschmidt@FreeBSD.org> | 2011-03-13 11:40:18 +0000 |
|---|---|---|
| committer | Bernhard Schmidt <bschmidt@FreeBSD.org> | 2011-03-13 11:40:18 +0000 |
| commit | fbbe47a9eab1433f5acf4172e444bf91cf84caab (patch) | |
| tree | b7adbfaf9604d3e766dd59002a1a19a465b9981a /sys/net80211/ieee80211.c | |
| parent | 23dcc4c65552d843f0f3d43073cd2fef228b47cd (diff) | |
| download | src-fbbe47a9eab1433f5acf4172e444bf91cf84caab.tar.gz src-fbbe47a9eab1433f5acf4172e444bf91cf84caab.zip | |
First step on removing the harcoded RX/TX stream and MCS0-15 assumptions.
Initialize ic_rxstream/ic_txstream with 2, for compatibility reasons.
Introduce 4 new HTC flags, which are used in addition to ic_rxstream
and ic_txstream to compute the hc_mcsset content and also for initializing
ni_htrates. The number of spatial streams is enough to determine support
for MCS0-31 but not for MCS32-76 as well as some TX parameters in the
hc_mcsset field.
Notes
Notes:
svn path=/head/; revision=219596
Diffstat (limited to 'sys/net80211/ieee80211.c')
| -rw-r--r-- | sys/net80211/ieee80211.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 306a4b5ddab7..c433c2c2ecd5 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -206,6 +206,15 @@ ieee80211_chan_init(struct ieee80211com *ic) DEFAULTRATES(IEEE80211_MODE_11NG, ieee80211_rateset_11g); /* + * Setup required information to fill the mcsset field, if driver did + * not. Assume a 2T2R setup for historic reasons. + */ + if (ic->ic_rxstream == 0) + ic->ic_rxstream = 2; + if (ic->ic_txstream == 0) + ic->ic_txstream = 2; + + /* * Set auto mode to reset active channel state and any desired channel. */ (void) ieee80211_setmode(ic, IEEE80211_MODE_AUTO); |