diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-02-25 06:24:10 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-25 15:33:39 -0500 |
commit | 90b4ca9dba87bef9a3352c3d5bcab998be70fc4f (patch) | |
tree | ee0e76a2ccc45f1cfa096a7e284dd0913a5ced51 /net | |
parent | 46c2cb8cae87c903caba67eb8afc0f8985832956 (diff) |
mac80211: copy peer MCS TX parameters
We need to copy this to allow drivers to look
at the information where needed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/ht.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 75d679d75e63..b9e4b9bd2179 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c | |||
@@ -66,6 +66,9 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband, | |||
66 | /* own MCS TX capabilities */ | 66 | /* own MCS TX capabilities */ |
67 | tx_mcs_set_cap = sband->ht_cap.mcs.tx_params; | 67 | tx_mcs_set_cap = sband->ht_cap.mcs.tx_params; |
68 | 68 | ||
69 | /* Copy peer MCS TX capabilities, the driver might need them. */ | ||
70 | ht_cap->mcs.tx_params = ht_cap_ie->mcs.tx_params; | ||
71 | |||
69 | /* can we TX with MCS rates? */ | 72 | /* can we TX with MCS rates? */ |
70 | if (!(tx_mcs_set_cap & IEEE80211_HT_MCS_TX_DEFINED)) | 73 | if (!(tx_mcs_set_cap & IEEE80211_HT_MCS_TX_DEFINED)) |
71 | return; | 74 | return; |
@@ -79,7 +82,7 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband, | |||
79 | max_tx_streams = IEEE80211_HT_MCS_TX_MAX_STREAMS; | 82 | max_tx_streams = IEEE80211_HT_MCS_TX_MAX_STREAMS; |
80 | 83 | ||
81 | /* | 84 | /* |
82 | * 802.11n D5.0 20.3.5 / 20.6 says: | 85 | * 802.11n-2009 20.3.5 / 20.6 says: |
83 | * - indices 0 to 7 and 32 are single spatial stream | 86 | * - indices 0 to 7 and 32 are single spatial stream |
84 | * - 8 to 31 are multiple spatial streams using equal modulation | 87 | * - 8 to 31 are multiple spatial streams using equal modulation |
85 | * [8..15 for two streams, 16..23 for three and 24..31 for four] | 88 | * [8..15 for two streams, 16..23 for three and 24..31 for four] |