From: Felix Fietkau Date: Mon, 1 Oct 2018 11:24:00 +0000 (+0200) Subject: mt76: mt76x2: fix multi-interface beacon configuration X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5972^2~144^2~23^2 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=5289976ad887deb07c76df7eecf553c264aeebed;p=linux.git 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 --- diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c index 25ce8fcbb873..bb9c0a059a6e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c @@ -129,8 +129,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)