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 C14D613C8E8; Mon, 18 Aug 2025 13:54:41 +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=1755525281; cv=none; b=A5rdbhjmWq7Z1tDd3uD8K4Ba2QYQfbBLJKzStY+WAZg7FVbz4IkWs5f7GQBgvKUQ0rfOvO87Qn5dCjEkHOXmbWIzrt/DBXuehKH74ncQaDcKnFix/5mHte+ccfrIkFzLxXphDB55WBDqajgVgPZhBxGAwMrxv/rpBcSlnd9ZaLw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755525281; c=relaxed/simple; bh=iWO9JQOmnKaTAZY9yQTVSY+TdPgS7aTtqk4vzOm16VE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DvRpRZRAbm+UVGusHivhZIs5E5A3dXHtG/PH3DGZdUIGSGeDq/WbIGPh40T/6+K4U91aRN4HJetaWHpgY8gLbNSdKxHGaF7M2bins57hDYFeoBA5WS+z5ceDuhv7YnSmM12q8u9F2XnlCofW0vL8A4LpQiq9vhaNikQBAheAqaE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=d1Er9HFK; 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="d1Er9HFK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C44AC113D0; Mon, 18 Aug 2025 13:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755525281; bh=iWO9JQOmnKaTAZY9yQTVSY+TdPgS7aTtqk4vzOm16VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1Er9HFKgBWlnsuTiGrKJAGlDdx/VWGPVBw/q1XSqN7aI2ysfSB14i3ZQGEeyHZ5k pjb27V/qEdI/AOlSLIgcakkvWsa7BHh7WPS4fmIS3X1DhZmUzkrD+6g6fEATZpY6C9 UtIfuejQEX0pATxwN3HD1cdiFoRAgT+X0583TGPc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Somashekhar Puttagangaiah , Johannes Berg , Miri Korenblit , Sasha Levin Subject: [PATCH 6.16 215/570] wifi: iwlwifi: mld: use spec link id and not FW link id Date: Mon, 18 Aug 2025 14:43:22 +0200 Message-ID: <20250818124514.085764290@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124505.781598737@linuxfoundation.org> References: <20250818124505.781598737@linuxfoundation.org> User-Agent: quilt/0.68 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.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miri Korenblit [ Upstream commit 170db5f873850a04a8eafd3401b2ea36adb20cea ] In missed beacon handling, we compare the FW link id to the bss_param_ch_cnt_link_id, which is a spec link id. Fix it. Reviewed-by: Somashekhar Puttagangaiah Reviewed-by: Johannes Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250723094230.2104f8cac836.I25ed77c2b87bde82a9153e2aa26e09b8a42f6ee3@changeid Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mld/link.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mld/link.c b/drivers/net/wireless/intel/iwlwifi/mld/link.c index d0f56189ad3f..2bf4c773ce8a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/link.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/link.c @@ -864,21 +864,23 @@ void iwl_mld_handle_missed_beacon_notif(struct iwl_mld *mld, { const struct iwl_missed_beacons_notif *notif = (const void *)pkt->data; union iwl_dbg_tlv_tp_data tp_data = { .fw_pkt = pkt }; - u32 link_id = le32_to_cpu(notif->link_id); + u32 fw_link_id = le32_to_cpu(notif->link_id); u32 missed_bcon = le32_to_cpu(notif->consec_missed_beacons); u32 missed_bcon_since_rx = le32_to_cpu(notif->consec_missed_beacons_since_last_rx); u32 scnd_lnk_bcn_lost = le32_to_cpu(notif->consec_missed_beacons_other_link); struct ieee80211_bss_conf *link_conf = - iwl_mld_fw_id_to_link_conf(mld, link_id); + iwl_mld_fw_id_to_link_conf(mld, fw_link_id); u32 bss_param_ch_cnt_link_id; struct ieee80211_vif *vif; + u8 link_id; if (WARN_ON(!link_conf)) return; vif = link_conf->vif; + link_id = link_conf->link_id; bss_param_ch_cnt_link_id = link_conf->bss_param_ch_cnt_link_id; IWL_DEBUG_INFO(mld, @@ -890,7 +892,7 @@ void iwl_mld_handle_missed_beacon_notif(struct iwl_mld *mld, mld->trans->dbg.dump_file_name_ext_valid = true; snprintf(mld->trans->dbg.dump_file_name_ext, IWL_FW_INI_MAX_NAME, - "LinkId_%d_MacType_%d", link_id, + "LinkId_%d_MacType_%d", fw_link_id, iwl_mld_mac80211_iftype_to_fw(vif)); iwl_dbg_tlv_time_point(&mld->fwrt, -- 2.39.5