This is a note to let you know that I've just added the patch titled
wifi: mt76: mt7921: do not support one stream on secondary antenna only
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-mt76-mt7921-do-not-support-one-stream-on-secondary-antenna-only.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d616d3680264beb9a9d2c4fc681064b06f447eeb Mon Sep 17 00:00:00 2001
From: Deren Wu <deren.wu@xxxxxxxxxxxx>
Date: Wed, 10 May 2023 14:51:13 +0800
Subject: wifi: mt76: mt7921: do not support one stream on secondary antenna only
From: Deren Wu <deren.wu@xxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
Fixes: e0f9fdda81bd ("mt76: mt7921: add ieee80211_ops")
Suggested-by: Knox Chiou <knoxchiou@xxxxxxxxxx>
Signed-off-by: Deren Wu <deren.wu@xxxxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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);
Patches currently in stable-queue which might be from deren.wu@xxxxxxxxxxxx are
queue-6.5/wifi-mt76-mt7921-do-not-support-one-stream-on-secondary-antenna-only.patch
queue-6.5/wifi-mt76-mt7921-fix-skb-leak-by-txs-missing-in-amsdu.patch
