Skip to contentSkip to conversation

carl9170: fix missing bit-wise or operator for tx_params

PATCH In review Colin Ian King 3 participants 3 messages Jan 25, 2022 – Jan 31, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 carl9170: fix missing bit-wise or operator for tx_params

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 fe8ee9ad80b2 ("carl9170: mac80211 glue and command interface")

---

V2: change subject line to match the correct fix, add in the
missing | operator

---
 drivers/net/wireless/ath/carl9170/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/main.c +1 -1
index 49f7ee1c912b..2208ec800482 100644
@@ -1914,7 +1914,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;
Signature · 1 line
2.33.1
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Colin Ian King

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 fe8ee9ad80b2 ("carl9170: mac80211 glue and command interface")

Of course:

#2 lore raw
In reply to Colin Ian King
Quoted 6 lines · Colin Ian King

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.

Quoted 7 lines

Kudos to Christian Lamparter for suggesting the correct fix.

Fixes fe8ee9ad80b2 ("carl9170: mac80211 glue and command interface")

Patch applied to ath-next branch of ath.git, thanks.

02a95374b5ee carl9170: fix missing bit-wise or operator for tx_params

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches