| From 9a1c287e9f47ea3ed6f0c6e1679b79390980b827 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 4 Mar 2021 21:25:21 +0800 |
| Subject: mt76: mt7663: fix when beacon filter is being applied |
| |
| From: Sean Wang <sean.wang@mediatek.com> |
| |
| [ 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> |
| --- |
| drivers/net/wireless/mediatek/mt76/mt7615/main.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c |
| index a42b4d96860d..0ec836af211c 100644 |
| --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c |
| +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c |
| @@ -231,8 +231,6 @@ static int mt7615_add_interface(struct ieee80211_hw *hw, |
| ret = mt7615_mcu_add_dev_info(dev, vif, true); |
| if (ret) |
| goto out; |
| - |
| - mt7615_mac_set_beacon_filter(phy, vif, true); |
| out: |
| mt7615_mutex_release(dev); |
| |
| @@ -258,7 +256,6 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw, |
| |
| mt7615_free_pending_tx_skbs(dev, msta); |
| |
| - mt7615_mac_set_beacon_filter(phy, vif, false); |
| mt7615_mcu_add_dev_info(dev, vif, false); |
| |
| rcu_assign_pointer(dev->mt76.wcid[idx], NULL); |
| @@ -557,6 +554,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); |
| } |
| |
| -- |
| 2.30.2 |
| |