1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index be2979f34f31..91ff6598eccf 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -905,14 +905,14 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable)
                 mt76_set(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);
                 mt76_rmw(dev, MT_BBP(AGC, 2), GENMASK(15, 0),
                          ed_th << 8 | ed_th);
-                if (!is_mt76x2(dev))
-                        mt76_set(dev, MT_TXOP_HLDR_ET,
-                                 MT_TXOP_HLDR_TX40M_BLK_EN);
+                mt76_set(dev, MT_TXOP_HLDR_ET, MT_TXOP_HLDR_TX40M_BLK_EN);
         } else {
                 mt76_set(dev, MT_TX_LINK_CFG, MT_TX_CFACK_EN);
                 mt76_clear(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);
                 if (is_mt76x2(dev)) {
                         mt76_wr(dev, MT_BBP(AGC, 2), 0x00007070);
+                        mt76_set(dev, MT_TXOP_HLDR_ET,
+                                 MT_TXOP_HLDR_TX40M_BLK_EN);
                 } else {
                         mt76_wr(dev, MT_BBP(AGC, 2), 0x003a6464);
                         mt76_clear(dev, MT_TXOP_HLDR_ET,
@@ -1126,6 +1126,9 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
         else if (val)
                 skb = ieee80211_beacon_get(mt76_hw(dev), vif);
 
+        if (!dev->beacon_mask)
+                dev->tbtt_count = 0;
+
         __mt76x02_mac_set_beacon_enable(dev, vif_idx, val, skb);
 
         if (mt76_is_mmio(dev))