| Message ID | fa77d4843c4e986db81960c7f859d0750e2b9e8d.1727869380.git-series.nbd@nbd.name (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | wifi: cfg80211/mac80211: improve support for multiple radios | expand |
On Wed, 2024-10-02 at 13:45 +0200, Felix Fietkau wrote: > > @@ -1215,14 +1217,16 @@ int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata, > } else { > for (i = 0; i < n_channels; i++) { > if (channels[i]->flags & (IEEE80211_CHAN_NO_IR | > - IEEE80211_CHAN_DISABLED)) > + IEEE80211_CHAN_DISABLED) || > + !cfg80211_wdev_channel_allowed(&sdata->wdev, > + channels[i])) > continue; > > local->int_scan_req->channels[n_ch] = channels[i]; > n_ch++; > } > > - if (WARN_ON_ONCE(n_ch == 0)) > + if (n_ch == 0) > goto unlock; -EBUSY seems somewhat confusing in this case? johannes
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index adb88c06b598..8b77b782696c 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -1200,7 +1200,9 @@ int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata, &local->hw.wiphy->bands[band]->channels[i]; if (tmp_ch->flags & (IEEE80211_CHAN_NO_IR | - IEEE80211_CHAN_DISABLED)) + IEEE80211_CHAN_DISABLED) || + !cfg80211_wdev_channel_allowed(&sdata->wdev, + tmp_ch)) continue; local->int_scan_req->channels[n_ch] = tmp_ch; @@ -1215,14 +1217,16 @@ int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata, } else { for (i = 0; i < n_channels; i++) { if (channels[i]->flags & (IEEE80211_CHAN_NO_IR | - IEEE80211_CHAN_DISABLED)) + IEEE80211_CHAN_DISABLED) || + !cfg80211_wdev_channel_allowed(&sdata->wdev, + channels[i])) continue; local->int_scan_req->channels[n_ch] = channels[i]; n_ch++; } - if (WARN_ON_ONCE(n_ch == 0)) + if (n_ch == 0) goto unlock; local->int_scan_req->n_channels = n_ch;
Reject frequencies not supported by any radio that the vif is allowed to use. Signed-off-by: Felix Fietkau <nbd@nbd.name> --- net/mac80211/scan.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)