From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 452C6161911; Mon, 27 May 2024 19:02:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716836557; cv=none; b=TviQsug1IofGkN91eQ3KF80cv3H6Hl0odU1Tg7LL3TJkitCoTLMbGjWzoZUrVmojKU7BlCtRAojg9zx0hrb+5QZBUshVQzc+pHCbnmug95+7DtvRdHxLZGeRBjLH1BSvFY6BKpHcN+harge/i1NgypQkahQAhReq1ABsLeDtld4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716836557; c=relaxed/simple; bh=gDDH2LtUiIoBbKP3sV5WKVtJF+7GeFqh2aY2gMV9Kv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oxbclnD2N1sp16s/YOHnVuRcHYKEjjhrFtO914DhxnDTpxo4QhnVSJ9bGj+V/Tj4hbikVMNa7A93GOPO+JQxJwBumpWnJqDDNCsYGfVZOXgzkEVu2nJVjeiV3ExOj8T6V55i+pYjxXCpRinLJElx5SFYBF7KJXNaqVlnPlK+EqI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PVDpPBci; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PVDpPBci" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C506C32786; Mon, 27 May 2024 19:02:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1716836556; bh=gDDH2LtUiIoBbKP3sV5WKVtJF+7GeFqh2aY2gMV9Kv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PVDpPBciJktRLjOQ03IpVJxeBwGttS7zBH7lB84T89BMxTsL2grO9C2e8/KxtBf/l 3yBHDnRZuiUxVvekkSin2ry1XYgmZemDJpo2YOLrC25Fk9gjaTrcUR8ENjE2OL3N1s mfAYd2ZAMejvmApXyFpZmSX5OB0jBCeSY9wMV+KQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ilan Peer , Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 6.9 101/427] wifi: iwlwifi: mvm: Do not warn on invalid link on scan complete Date: Mon, 27 May 2024 20:52:28 +0200 Message-ID: <20240527185611.204856637@linuxfoundation.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240527185601.713589927@linuxfoundation.org> References: <20240527185601.713589927@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilan Peer [ Upstream commit 1c78d39f4ede227e50e36165b3a76bc7c37ead02 ] As it is possible that by the time the scan is completed the link was already removed. Fixes: 3a5a5cb06700 ("wifi: iwlwifi: mvm: Correctly report TSF data in scan complete") Signed-off-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://msgid.link/20240319100755.619d3574a757.I0523e92547f0288c8b0119b1fdc5e967a5a8956e@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 11559563ae381..22bc032cffc8b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -3171,8 +3171,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.43.0