diff options
| author | Ayala Beker <ayala.beker@intel.com> | 2024-03-13 23:43:29 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:41:14 +0000 |
| commit | dbdb660d5b59fd4ff09f14ffece6858f1c631e47 (patch) | |
| tree | da6f653c871168e86b718af7b18ed2c4469777c9 | |
| parent | a6f14576359f6ca6ec029d28d2137f0f6d9da7eb (diff) | |
| download | backport-iwlwifi-dbdb660d5b59fd4ff09f14ffece6858f1c631e47.tar.gz | |
[BUGFIX] wifi: mac80211: don't select link ID if not provided in scan request
If scan request doesn't include a link ID to be used for TSF
reporting, don't select it as it might become inactive before
scan is actually started by the driver.
Instead, let the driver select one of the active links.
type=bugfix
ticket=jira:WIFI-393745
fixes=Iae9605cbb7f9d52e00ce98260b3559a34cf18341
Change-Id: Ic28ed9a611432387b7f85e9ca9a97a4ce34a6e0f
Signed-off-by: Ayala Beker <ayala.beker@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98979
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
(cherry picked from commit 53296f3a02f851cc2e6d6b2fecb98926fc7f4983)
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99843
Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
PerCI-Ready: Golan Ben Ami <golan.ben.ami@intel.com>
x-iwlwifi-stack-dev: 1f212343a388a77bc844fe5f451e26d2d0684779
| -rw-r--r-- | net/mac80211/scan.c | 16 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 5 insertions, 13 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 4ff3e28685..c7c944f3a2 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -704,19 +704,11 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata, return -EBUSY; /* For an MLO connection, if a link ID was specified, validate that it - * is indeed active. If no link ID was specified, select one of the - * active links. + * is indeed active. */ - if (ieee80211_vif_is_mld(&sdata->vif)) { - if (req->tsf_report_link_id >= 0) { - if (!(sdata->vif.active_links & - BIT(req->tsf_report_link_id))) - return -EINVAL; - } else { - req->tsf_report_link_id = - __ffs(sdata->vif.active_links); - } - } + if (ieee80211_vif_is_mld(&sdata->vif) && req->tsf_report_link_id >= 0 && + !(sdata->vif.active_links & BIT(req->tsf_report_link_id))) + return -EINVAL; if (!__ieee80211_can_leave_ch(sdata)) return -EBUSY; @@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12044:08977015" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12045:1f212343" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |