gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: fix multi-radio on-channel scanning

Browse Source 
avoid unnecessary channel switch when performing an on-channel scan
using a multi-radio device.

Fixes: c56d6edebc1f ("wifi: mt76: mt7996: use emulated hardware scan support")
Signed-off-by: Chad Monroe <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Chad Monroe
2026-01-28 09:23:17 +00:00
committed by Felix Fietkau
parent a5930632e1
commit 2596285c6a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scan.c
+7 -5
View File
@@ -16,7 +16,7 @@ static void mt76_scan_complete(struct mt76_dev *dev, bool abort)
clear_bit(MT76_SCANNING, &phy->state); clear_bit(MT76_SCANNING, &phy->state);
if (dev->scan.chan && phy->main_chandef.chan && if (dev->scan.chan && phy->main_chandef.chan && phy->offchannel &&
!test_bit(MT76_MCU_RESET, &dev->phy.state)) !test_bit(MT76_MCU_RESET, &dev->phy.state))
mt76_set_channel(phy, &phy->main_chandef, false); mt76_set_channel(phy, &phy->main_chandef, false);
mt76_put_vif_phy_link(phy, dev->scan.vif, dev->scan.mlink); mt76_put_vif_phy_link(phy, dev->scan.vif, dev->scan.mlink);
@@ -94,7 +94,7 @@ void mt76_scan_work(struct work_struct *work)
return; return;
} }
if (dev->scan.chan && phy->num_sta) { if (dev->scan.chan && phy->num_sta && phy->offchannel) {
dev->scan.chan = NULL; dev->scan.chan = NULL;
mt76_set_channel(phy, &phy->main_chandef, false); mt76_set_channel(phy, &phy->main_chandef, false);
goto out; goto out;
@@ -102,20 +102,22 @@ void mt76_scan_work(struct work_struct *work)
dev->scan.chan = req->channels[dev->scan.chan_idx++]; dev->scan.chan = req->channels[dev->scan.chan_idx++];
cfg80211_chandef_create(&chandef, dev->scan.chan, NL80211_CHAN_HT20); cfg80211_chandef_create(&chandef, dev->scan.chan, NL80211_CHAN_HT20);
mt76_set_channel(phy, &chandef, true); if (dev->scan.chan != phy->main_chandef.chan)
mt76_set_channel(phy, &chandef, true);
if (!req->n_ssids || if (!req->n_ssids ||
chandef.chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)) chandef.chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR))
goto out; goto out;
duration = HZ / 16; /* ~60 ms */ if (phy->offchannel)
duration = HZ / 16; /* ~60 ms */
local_bh_disable(); local_bh_disable();
for (i = 0; i < req->n_ssids; i++) for (i = 0; i < req->n_ssids; i++)
mt76_scan_send_probe(dev, &req->ssids[i]); mt76_scan_send_probe(dev, &req->ssids[i]);
local_bh_enable(); local_bh_enable();
out: out:
if (dev->scan.chan) if (dev->scan.chan && phy->offchannel)
duration = max_t(int, duration, duration = max_t(int, duration,
msecs_to_jiffies(req->duration + msecs_to_jiffies(req->duration +
(req->duration >> 5))); (req->duration >> 5)));