wifi: mt76: optimize ROC for same-channel case

mt76_remain_on_channel() always creates an HT20 chandef and goes
offchannel, even when the ROC channel matches the operating channel.
This unnecessarily narrows bandwidth and triggers beacon stop/restart.

When the ROC channel matches the current operating channel, preserve
the full chandef and skip the offchannel transition, matching the
optimization already present in the scan code.

Extract the shared same-channel detection into mt76_offchannel_chandef()
and use it in both ROC and scan paths.

Link: https://patch.msgid.link/20260309060730.87840-6-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/channel.c b/drivers/net/wireless/mediatek/mt76/channel.c
index 8d2e72c68c6b899fcd61caadc30a75e85e3df22a..f42f251015448e39818059b966f59f5abcea3159 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/channel.c
+++ b/drivers/net/wireless/mediatek/mt76/channel.c
@@ -392,8 +392,8 @@ int mt76_remain_on_channel(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        mlink->mvif->roc_phy = phy;
        phy->roc_vif = vif;
        phy->roc_link = mlink;
-       cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_HT20);
-       ret = __mt76_set_channel(phy, &chandef, true);
+       ret = __mt76_set_channel(phy, &chandef,
+                                mt76_offchannel_chandef(phy, chan, &chandef));
        if (ret) {
                mlink->mvif->roc_phy = NULL;
                phy->roc_vif = NULL;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index ffeb4b4c425be58b620517da1c8c7de13e15bbce..c7c9ffd0dc3b9dd34929e95ae65d60fddd370e23 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1790,6 +1790,18 @@ void mt76_queue_tx_complete(struct mt76_dev *dev, struct mt76_queue *q,
                            struct mt76_queue_entry *e);
 int __mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,
                       bool offchannel);
+
+static inline bool
+mt76_offchannel_chandef(struct mt76_phy *phy, struct ieee80211_channel *chan,
+                       struct cfg80211_chan_def *chandef)
+{
+       cfg80211_chandef_create(chandef, chan, NL80211_CHAN_HT20);
+       if (phy->main_chandef.chan != chan)
+               return true;
+
+       *chandef = phy->main_chandef;
+       return false;
+}
 int mt76_set_channel(struct mt76_phy *phy, struct cfg80211_chan_def *chandef,
                     bool offchannel);
 void mt76_scan_work(struct work_struct *work);

diff --git a/drivers/net/wireless/mediatek/mt76/scan.c b/drivers/net/wireless/mediatek/mt76/scan.c
index 2b5f30cef79517080c65ff290b99395a8e5060c4..5a67e9b8183a714e734ad545f4703d84bc6be4f8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/scan.c
+++ b/drivers/net/wireless/mediatek/mt76/scan.c
@@ -139,11 +139,7 @@ void mt76_scan_work(struct work_struct *work)
        }
 
        dev->scan.chan = req->channels[dev->scan.chan_idx++];
-       cfg80211_chandef_create(&chandef, dev->scan.chan, NL80211_CHAN_HT20);
-       if (phy->main_chandef.chan == dev->scan.chan) {
-               chandef = phy->main_chandef;
-               offchannel = false;
-       }
+       offchannel = mt76_offchannel_chandef(phy, dev->scan.chan, &chandef);
 
        mt76_set_channel(phy, &chandef, offchannel);