6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Deren Wu deren.wu@mediatek.com
commit d616d3680264beb9a9d2c4fc681064b06f447eeb upstream.
mt7921 support following antenna combiantions only. * primary + secondary (2x2) * primary only (1x1)
Since we cannot work on secondary antenna only, return error if the antenna bitmap is 0x2 in .set_antenna().
For example: iw phy0 set antenna 3 3 /* valid */ iw phy0 set antenna 1 1 /* valid */ iw phy0 set antenna 2 2 /* invalid */
Cc: stable@vger.kernel.org Fixes: e0f9fdda81bd ("mt76: mt7921: add ieee80211_ops") Suggested-by: Knox Chiou knoxchiou@google.com Signed-off-by: Deren Wu deren.wu@mediatek.com Signed-off-by: Felix Fietkau nbd@nbd.name Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -1363,7 +1363,7 @@ mt7921_set_antenna(struct ieee80211_hw * return -EINVAL;
if ((BIT(hweight8(tx_ant)) - 1) != tx_ant) - tx_ant = BIT(ffs(tx_ant) - 1) - 1; + return -EINVAL;
mt7921_mutex_acquire(dev);