Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

rt2800: correctly report MCS TX parameters

Browse Source 
We should only set IEEE80211_HT_MCS_TX_RX_DIF when TX and RX MCS sets
are not equal, i.e. when number of tx streams is different than
number of RX streams.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Stanislaw Gruszka 2016-11-18 10:43:53 +01:00 committed by Kalle Valo
parent f25ba69c63
commit cea5b03d8a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/ralink/rt2x00/rt2800lib.c
View File

@ -7461,7 +7461,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
char *default_power1; char *default_power1;
char *default_power2; char *default_power2;
char *default_power3; char *default_power3;
unsigned int i; unsigned int i, tx_chains, rx_chains;
u32 reg; u32 reg;
/* /*
@ -7586,21 +7586,24 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_20 |
IEEE80211_HT_CAP_SGI_40; IEEE80211_HT_CAP_SGI_40;
if (rt2x00dev->default_ant.tx_chain_num >= 2) tx_chains = rt2x00dev->default_ant.tx_chain_num;
rx_chains = rt2x00dev->default_ant.rx_chain_num;
if (tx_chains >= 2)
spec->ht.cap |= IEEE80211_HT_CAP_TX_STBC; spec->ht.cap |= IEEE80211_HT_CAP_TX_STBC;
spec->ht.cap |= rt2x00dev->default_ant.rx_chain_num << spec->ht.cap |= rx_chains << IEEE80211_HT_CAP_RX_STBC_SHIFT;
IEEE80211_HT_CAP_RX_STBC_SHIFT;
spec->ht.ampdu_factor = 3; spec->ht.ampdu_factor = 3;
spec->ht.ampdu_density = 4; spec->ht.ampdu_density = 4;
spec->ht.mcs.tx_params = spec->ht.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
IEEE80211_HT_MCS_TX_DEFINED | if (tx_chains != rx_chains) {
IEEE80211_HT_MCS_TX_RX_DIFF | spec->ht.mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
((rt2x00dev->default_ant.tx_chain_num - 1) << spec->ht.mcs.tx_params |=
IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT); (tx_chains - 1) << IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;
}
switch (rt2x00dev->default_ant.rx_chain_num) { switch (rx_chains) {
case 3: case 3:
spec->ht.mcs.rx_mask[2] = 0xff; spec->ht.mcs.rx_mask[2] = 0xff;
case 2: case 2: