diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2024-03-12 04:01:11 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:10:29 +0000 |
| commit | b0376bfb74b5f8d35383acbd34e6b77d278e4a61 (patch) | |
| tree | 09f3770925e4ece782ff1f1a5d59c3031cbd14c3 | |
| parent | 7227c8ae773f2f99d266b38df84e7084651bf9a3 (diff) | |
| download | backport-iwlwifi-b0376bfb74b5f8d35383acbd34e6b77d278e4a61.tar.gz | |
[BUGFIX] wifi: iwlwifi: mvm: Do not warn on invalid link on scan complete
As it is possible that by the time the scan is completed the link was
already removed.
type=bugfix
ticket=jira:WIFI-394257
fixes=I6c4941bfab3a04498370e58b402c64d990c39fbf
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Change-Id: I0523e92547f0288c8b0119b1fdc5e967a5a8956e
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98475
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>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 29c6b05163fb31043f50ee3e0b06d2d310d1e87f
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 7 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index a89bcc2061..16f61db0e7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -3151,8 +3151,13 @@ void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm, struct iwl_mvm_vif_link_info *link_info = scan_vif->link[mvm->scan_link_id]; - if (!WARN_ON(!link_info)) + /* It is possible that by the time the scan is complete the link + * was already removed and is not valid. + */ + if (link_info) memcpy(info.tsf_bssid, link_info->bssid, ETH_ALEN); + else + IWL_DEBUG_SCAN(mvm, "Scan link is no longer valid\n"); ieee80211_scan_completed(mvm->hw, &info); mvm->scan_vif = NULL; @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12002:16e43274" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12003:29c6b051" |