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 CDF3E1DA2F8; Tue, 3 Sep 2024 20:44:28 +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=1725396268; cv=none; b=TKl8x+xByNWPy5uH3v1yvmeU9k9z/cka14N3T/kABdYLoAsMvUGJuZH0AmSZQ0v2eFydS4MxxCo2+KlHNaWSXrt0M5aKt81EwNL44nGLf3qoKoO6TVY+An/STKvewjgbKSB2N2by8p0nlmD17Yf637t54wwNL25fJ9Qm5wpYD00= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725396268; c=relaxed/simple; bh=DTXynpVjpmJV2mS6p6gaFpcTdmx1NC4cUgq+dNQKo0A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iMYiPkM64oiJqqF9mr6fUCPoM8b+5HNDuAzJyA+Epm5w6KNVKtw9CtWHu1xZ06MPoN1ECAY0NiVFtW4QGy5jkCRbQ9S4aqaNFAaWA4Gmi5JkakXBZuwFVM+JQ+XYJ2o1334BXB1oasQsq+h4soRULwhwaZACGRARFNgFpXT40s0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pHRdJtKU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pHRdJtKU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67E24C4CEC4; Tue, 3 Sep 2024 20:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725396268; bh=DTXynpVjpmJV2mS6p6gaFpcTdmx1NC4cUgq+dNQKo0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pHRdJtKUf4mnUP8uhG9RYHd6N3SpDWpb0xffk9HfRBgSUidNPkhae4Mh5Z1TCUgl8 R2mB2K8TXZtqfOAWVY16ngkwoxz7x8ovTbKuS0WfY9ZbgOjQ+UMbiBDVnUz1B/8xHz 8/M4nKDpvUbD1JkXs1QsUTPsbzL04LQ3RZHwtM8/VYQfoX9EZrRSgDppFyn+AW+nfy 2U3e88be0B/YcjRkv+l82oqGFOaRgGkptWICaRmg8eCnk8OkuzHW9XOIfivAsdXADT EWWjlhaIbqF/9nKeMGh0DVqrQRIb9nIBoHl0BjDcCuHgdChbV5xbHjtZz0pjluJt4F D2zYJIVRr+wYA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Gabay , Ilan Peer , Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, ayala.beker@intel.com, benjamin.berg@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 16/20] wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room() Date: Tue, 3 Sep 2024 15:23:48 -0400 Message-ID: <20240903192425.1107562-16-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903192425.1107562-1-sashal@kernel.org> References: <20240903192425.1107562-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.48 Content-Transfer-Encoding: 8bit From: Daniel Gabay [ Upstream commit 916a5d9c5354c426220a0a6533a5e8ea1287d6ea ] Driver creates also the WFA TPC element, consider that in the calculation. Signed-off-by: Daniel Gabay Reviewed-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20240825191257.e710ce446b7f.I2715c6742e9c3d160e2ba41bc4b35de370d2ce34@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index c61068144c638..626620cd892f0 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -48,6 +48,8 @@ /* Number of iterations on the channel for mei filtered scan */ #define IWL_MEI_SCAN_NUM_ITER 5U +#define WFA_TPC_IE_LEN 9 + struct iwl_mvm_scan_timing_params { u32 suspend_time; u32 max_out_time; @@ -296,8 +298,8 @@ static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm) max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE; - /* we create the 802.11 header and SSID element */ - max_probe_len -= 24 + 2; + /* we create the 802.11 header SSID element and WFA TPC element */ + max_probe_len -= 24 + 2 + WFA_TPC_IE_LEN; /* DS parameter set element is added on 2.4GHZ band if required */ if (iwl_mvm_rrm_scan_needed(mvm)) @@ -724,8 +726,6 @@ static u8 *iwl_mvm_copy_and_insert_ds_elem(struct iwl_mvm *mvm, const u8 *ies, return newpos; } -#define WFA_TPC_IE_LEN 9 - static void iwl_mvm_add_tpc_report_ie(u8 *pos) { pos[0] = WLAN_EID_VENDOR_SPECIFIC; -- 2.43.0