Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa674631 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Fix IEEE80211_HT_CAP_RX_STBC assignment 



IEEE80211_HT_CAP_RX_STBC is a 2 bit flag, and should thus
never be set as normal flag. Instead we must read the number
of RX paths from the EEPROM and set the IEEE80211_HT_CAP_RX_STBC
with the correct value (using the same logic as the number of TX
streams).

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fdb87251

drivers/net/wireless/rt2x00/rt2800lib.c

+5 −2
Original line number Diff line number Diff line
@@ -2572,12 +2572,15 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	    IEEE80211_HT_CAP_SUP_WIDTH_20_40 |

	    IEEE80211_HT_CAP_GRN_FLD |

	    IEEE80211_HT_CAP_SGI_20 |

	    IEEE80211_HT_CAP_SGI_40 |

	    IEEE80211_HT_CAP_RX_STBC;

	    IEEE80211_HT_CAP_SGI_40;



	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_TXPATH) >= 2)

		spec->ht.cap |= IEEE80211_HT_CAP_TX_STBC;



	spec->ht.cap |=

	    rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH) <<

		IEEE80211_HT_CAP_RX_STBC_SHIFT;



	spec->ht.ampdu_factor = 3;

	spec->ht.ampdu_density = 4;

	spec->ht.mcs.tx_params =