mt76: mt76x2: fix multi-interface beacon configuration

commit 5289976ad887deb07c76df7eecf553c264aeebed upstream.

If the first virtual interface is a station (or an AP with beacons
temporarily disabled), the beacon of the second interface needs to
occupy hardware beacon slot 0.
For some reason the beacon index was incorrectly masked with the
virtual interface beacon mask, which prevents the secondary
interface from sending beacons unless the first one also does.

Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c
index 8985446570bdf1750d249578dfc54c0c22ac108b..190c699d6e3ba39e6ced88582ef300d4b1729ed3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c
@@ -725,8 +725,7 @@ __mt76x2_mac_set_beacon(struct mt76x2_dev *dev, u8 bcn_idx, struct sk_buff *skb)
        if (skb) {
                ret = mt76_write_beacon(dev, beacon_addr, skb);
                if (!ret)
-                       dev->beacon_data_mask |= BIT(bcn_idx) &
-                                                dev->beacon_mask;
+                       dev->beacon_data_mask |= BIT(bcn_idx);
        } else {
                dev->beacon_data_mask &= ~BIT(bcn_idx);
                for (i = 0; i < beacon_len; i += 4)