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

Commit 5d553ed5 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

carl9170: fix missing bit-wise or operator for tx_params 



commit 02a95374b5eebdbd3b6413fd7ddec151d2ea75a1 upstream.

Currently tx_params is being re-assigned with a new value and the
previous setting IEEE80211_HT_MCS_TX_RX_DIFF is being overwritten.
The assignment operator is incorrect, the original intent was to
bit-wise or the value in. Fix this by replacing the = operator
with |= instead.

Kudos to Christian Lamparter for suggesting the correct fix.

Fixes: fe8ee9ad ("carl9170: mac80211 glue and command interface")
Signed-off-by: default avatarColin Ian King <colin.i.king@gmail.com>
Cc: <Stable@vger.kernel.org>
Acked-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220125004406.344422-1-colin.i.king@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55f078dc

drivers/net/wireless/ath/carl9170/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1917,7 +1917,7 @@ static int carl9170_parse_eeprom(struct ar9170 *ar) 
		WARN_ON(!(tx_streams >= 1 && tx_streams <=

			IEEE80211_HT_MCS_TX_MAX_STREAMS));



		tx_params = (tx_streams - 1) <<

		tx_params |= (tx_streams - 1) <<

			    IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;



		carl9170_band_2GHz.ht_cap.mcs.tx_params |= tx_params;