Commit 90b4ca9d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: copy peer MCS TX parameters 



We need to copy this to allow drivers to look
at the information where needed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 46c2cb8c

net/mac80211/ht.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -66,6 +66,9 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband, 
	/* own MCS TX capabilities */

	/* own MCS TX capabilities */

	tx_mcs_set_cap = sband->ht_cap.mcs.tx_params;

	tx_mcs_set_cap = sband->ht_cap.mcs.tx_params;





	/* Copy peer MCS TX capabilities, the driver might need them. */

	ht_cap->mcs.tx_params = ht_cap_ie->mcs.tx_params;



	/* can we TX with MCS rates? */

	/* can we TX with MCS rates? */

	if (!(tx_mcs_set_cap & IEEE80211_HT_MCS_TX_DEFINED))

	if (!(tx_mcs_set_cap & IEEE80211_HT_MCS_TX_DEFINED))

		return;

		return;
@@ -79,7 +82,7 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband, 
		max_tx_streams = IEEE80211_HT_MCS_TX_MAX_STREAMS;

		max_tx_streams = IEEE80211_HT_MCS_TX_MAX_STREAMS;





	/*

	/*

	 * 802.11n D5.0 20.3.5 / 20.6 says:

	 * 802.11n-2009 20.3.5 / 20.6 says:

	 * - indices 0 to 7 and 32 are single spatial stream

	 * - indices 0 to 7 and 32 are single spatial stream

	 * - 8 to 31 are multiple spatial streams using equal modulation

	 * - 8 to 31 are multiple spatial streams using equal modulation

	 *   [8..15 for two streams, 16..23 for three and 24..31 for four]

	 *   [8..15 for two streams, 16..23 for three and 24..31 for four]