mt76: mt7663: fix when beacon filter is being applied

[ Upstream commit 4bec61d9fb9629c21e60cd24a97235ea1f6020ec ]

HW beacon filter command is being applied until we're in associated state
because the command would rely on the associated access point's beacon
interval and DTIM information.

Fixes: 7124198ab1a4 ("mt76: mt7615: enable beacon filtering by default for offload fw")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 8263ff81bb7b5f2279fc04b1e0dc8d3c051c3b99..6107e827b38365504bb802a9343b24ee1903b1f0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -217,8 +217,6 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
        ret = mt7615_mcu_add_dev_info(phy, vif, true);
        if (ret)
                goto out;
-
-       mt7615_mac_set_beacon_filter(phy, vif, true);
 out:
        mt7615_mutex_release(dev);
 
@@ -244,7 +242,6 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,
 
        mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->wcid);
 
-       mt7615_mac_set_beacon_filter(phy, vif, false);
        mt7615_mcu_add_dev_info(phy, vif, false);
 
        rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
@@ -544,6 +541,9 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_ARP_FILTER)
                mt7615_mcu_update_arp_filter(hw, vif, info);
 
+       if (changed & BSS_CHANGED_ASSOC)
+               mt7615_mac_set_beacon_filter(phy, vif, info->assoc);
+
        mt7615_mutex_release(dev);
 }