]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: mt76: check chanctx before restoring channel after ROC
authorFelix Fietkau <nbd@nbd.name>
Mon, 9 Mar 2026 06:07:23 +0000 (06:07 +0000)
committerFelix Fietkau <nbd@nbd.name>
Tue, 24 Mar 2026 15:49:31 +0000 (15:49 +0000)
mt76_remove_chanctx() sets phy->chanctx to NULL but does not clear
phy->main_chandef. If ROC is later performed on that phy, completion
tries to restore the stale main_chandef channel, programming the
hardware to sit on a channel with no active context.

Add a chanctx check to avoid restoring a channel when no context is
active.

Link: https://patch.msgid.link/20260309060730.87840-4-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/channel.c

index ae7b4ed27a5c8579655c3a19e224223f963b0065..cfff50892a6ed58c1f4f023d61d6dcc1fab94a8e 100644 (file)
@@ -324,7 +324,7 @@ void mt76_roc_complete(struct mt76_phy *phy)
 
        if (mlink)
                mlink->mvif->roc_phy = NULL;
-       if (phy->main_chandef.chan && phy->offchannel &&
+       if (phy->chanctx && phy->main_chandef.chan && phy->offchannel &&
            !test_bit(MT76_MCU_RESET, &dev->phy.state))
                __mt76_set_channel(phy, &phy->main_chandef, false);
        mt76_put_vif_phy_link(phy, phy->roc_vif, phy->roc_link);