diff --git a/mt7921/main.c b/mt7921/main.c index 63c663e5..e27d781b 100644 --- a/mt7921/main.c +++ b/mt7921/main.c @@ -1511,6 +1511,9 @@ static void mt7921_channel_switch_rx_beacon(struct ieee80211_hw *hw, struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv; u16 beacon_interval = vif->bss_conf.beacon_int; + if (!dev->new_ctx) + return; + if (cfg80211_chandef_identical(&chsw->chandef, &dev->new_ctx->def) && chsw->count) { diff --git a/mt7925/main.c b/mt7925/main.c index 73d37227..ec6eb289 100644 --- a/mt7925/main.c +++ b/mt7925/main.c @@ -2400,6 +2400,9 @@ static void mt7925_channel_switch_rx_beacon(struct ieee80211_hw *hw, if (ieee80211_vif_is_mld(vif)) return; + if (!dev->new_ctx) + return; + beacon_interval = vif->bss_conf.beacon_int; if (cfg80211_chandef_identical(&chsw->chandef,