mt76: mt76x2: fix multi-interface beacon configuration

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>
This commit is contained in:
Felix Fietkau 2018-10-01 13:24:00 +02:00
parent 49f45fa13d
commit 5289976ad8

View File

@ -129,8 +129,7 @@ __mt76x2_mac_set_beacon(struct mt76x2_dev *dev, u8 bcn_idx, struct sk_buff *skb)
if (skb) { if (skb) {
ret = mt76_write_beacon(dev, beacon_addr, skb); ret = mt76_write_beacon(dev, beacon_addr, skb);
if (!ret) if (!ret)
dev->beacon_data_mask |= BIT(bcn_idx) & dev->beacon_data_mask |= BIT(bcn_idx);
dev->beacon_mask;
} else { } else {
dev->beacon_data_mask &= ~BIT(bcn_idx); dev->beacon_data_mask &= ~BIT(bcn_idx);
for (i = 0; i < beacon_len; i += 4) for (i = 0; i < beacon_len; i += 4)