mt76x02: initialize mutli bss mode when set up address

BSSID is not strtirct related with beaconing (for example we can have
2 STA vifs) and more related with MAC address, so initaize BSSID when
setting MAC address.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 63fa27d..ae1727e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -548,8 +548,11 @@ mt76x02_mac_process_rate(struct mt76x02_dev *dev,
        return 0;
 }
 
-void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr)
+void mt76x02_mac_setaddr(struct mt76x02_dev *dev, const u8 *addr)
 {
+       static const u8 null_addr[ETH_ALEN] = {};
+       int i;
+
        ether_addr_copy(dev->mt76.macaddr, addr);
 
        if (!is_valid_ether_addr(dev->mt76.macaddr)) {
@@ -563,6 +566,16 @@ void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr)
        mt76_wr(dev, MT_MAC_ADDR_DW1,
                get_unaligned_le16(dev->mt76.macaddr + 4) |
                FIELD_PREP(MT_MAC_ADDR_DW1_U2ME_MASK, 0xff));
+
+       mt76_wr(dev, MT_MAC_BSSID_DW0,
+               get_unaligned_le32(dev->mt76.macaddr));
+       mt76_wr(dev, MT_MAC_BSSID_DW1,
+               get_unaligned_le16(dev->mt76.macaddr + 4) |
+               FIELD_PREP(MT_MAC_BSSID_DW1_MBSS_MODE, 3) | /* 8 APs + 8 STAs */
+               MT_MAC_BSSID_DW1_MBSS_LOCAL_BIT);
+
+       for (i = 0; i < 16; i++)
+               mt76x02_mac_set_bssid(dev, i, null_addr);
 }
 EXPORT_SYMBOL_GPL(mt76x02_mac_setaddr);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
index 940c07f..76e564b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
@@ -191,7 +191,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
 void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, bool legacy_prot,
                                   int ht_mode);
 void mt76x02_mac_set_rts_thresh(struct mt76x02_dev *dev, u32 val);
-void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr);
+void mt76x02_mac_setaddr(struct mt76x02_dev *dev, const u8 *addr);
 void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
                            struct sk_buff *skb, struct mt76_wcid *wcid,
                            struct ieee80211_sta *sta, int len);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 18434b0..1ecd4ef 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -668,16 +668,8 @@ static void mt76x02_set_beacon_offsets(struct mt76x02_dev *dev)
 
 void mt76x02_init_beacon_config(struct mt76x02_dev *dev)
 {
-       static const u8 null_addr[ETH_ALEN] = {};
        int i;
 
-       mt76_wr(dev, MT_MAC_BSSID_DW0,
-               get_unaligned_le32(dev->mt76.macaddr));
-       mt76_wr(dev, MT_MAC_BSSID_DW1,
-               get_unaligned_le16(dev->mt76.macaddr + 4) |
-               FIELD_PREP(MT_MAC_BSSID_DW1_MBSS_MODE, 3) | /* 8 beacons */
-               MT_MAC_BSSID_DW1_MBSS_LOCAL_BIT);
-
        /* Fire a pre-TBTT interrupt 8 ms before TBTT */
        mt76_rmw_field(dev, MT_INT_TIMER_CFG, MT_INT_TIMER_CFG_PRE_TBTT,
                       8 << 4);
@@ -687,10 +679,9 @@ void mt76x02_init_beacon_config(struct mt76x02_dev *dev)
 
        mt76_wr(dev, MT_BCN_BYPASS_MASK, 0xffff);
 
-       for (i = 0; i < 8; i++) {
-               mt76x02_mac_set_bssid(dev, i, null_addr);
+       for (i = 0; i < 8; i++)
                mt76x02_mac_set_beacon(dev, i, NULL);
-       }
+
        mt76x02_set_beacon_offsets(dev);
 }
 EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 4347d5e..0ccaa64 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -119,9 +119,7 @@ static int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)
        mt76_wr(dev, MT_MCU_CLOCK_CTL, 0x1401);
        mt76_clear(dev, MT_FCE_L2_STUFF, MT_FCE_L2_STUFF_WR_MPDU_LEN_EN);
 
-       mt76_wr(dev, MT_MAC_ADDR_DW0, get_unaligned_le32(macaddr));
-       mt76_wr(dev, MT_MAC_ADDR_DW1, get_unaligned_le16(macaddr + 4));
-
+       mt76x02_mac_setaddr(dev, macaddr);
        mt76x02_init_beacon_config(dev);
        if (!hard)
                return 0;