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

Commit e9f33a8f authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix RX STBC override byte order 



The original patch neglected to take byte order conversions
into account, fix that.

Fixes: d9bb4108 ("mac80211: allow overriding HT STBC capabilities")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarSergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c03fd017

net/mac80211/ht.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -112,8 +112,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, 
			     IEEE80211_HT_CAP_TX_STBC);

			     IEEE80211_HT_CAP_TX_STBC);





	/* Allow user to configure RX STBC bits */

	/* Allow user to configure RX STBC bits */

	if (ht_capa_mask->cap_info & IEEE80211_HT_CAP_RX_STBC)

	if (ht_capa_mask->cap_info & cpu_to_le16(IEEE80211_HT_CAP_RX_STBC))

		ht_cap->cap |= ht_capa->cap_info & IEEE80211_HT_CAP_RX_STBC;

		ht_cap->cap |= le16_to_cpu(ht_capa->cap_info) &

					IEEE80211_HT_CAP_RX_STBC;





	/* Allow user to decrease AMPDU factor */

	/* Allow user to decrease AMPDU factor */

	if (ht_capa_mask->ampdu_params_info &

	if (ht_capa_mask->ampdu_params_info &