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 AE4511E00B3; Tue, 3 Sep 2024 20:49:03 +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=1725396543; cv=none; b=fMiHX5UMoyfAe0vh9iToxEpuUdo3PwQunWnQxIV/dCHP/VVIc0KZkWCHIGi6e1HtliLcU1I4qDCD8qoYbZeNe6U9YxzchHCyG0Tk4Pt3wdeh3n/vxm56QmZ5cGZf0sISg239ZK/F5gqEdIE5/ObjUFzJhbcGbsjHm8G0btLxMNU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725396543; c=relaxed/simple; bh=C1hdTBqi1CQKXIDW4NVretcVSsxRArCO0Ef/KfTkxP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P/skzVSLUExCblhW62lNc48JiJrc+OELxejjgfqJz8nn7PYabjUg+g/KkEzV5TYCDgTcvVpzDrnFermifT8YlScl9vH6Z1ebQpgRPq8eJ7BvOpR9cMg2nMLb3vZuzixpKu3/rbWafW7aoKRplMKQqsSiNp9h45aVT1MIO9TduC4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iO0HGyyL; 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="iO0HGyyL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EACCC4CECC; Tue, 3 Sep 2024 20:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725396543; bh=C1hdTBqi1CQKXIDW4NVretcVSsxRArCO0Ef/KfTkxP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iO0HGyyLkGqcHoKU1YMJv5PqkkmreLWF+l/pb5vcmbKQ34qXz6MM0drD8sTd2PSXF NEnElHBHYkFneuNjGGCs82TqPkEXFrH0zZZ+EPUDJl0H/ay9SAIFJUX7Dg8IAf4npw Z1w6MVtn2lFSQrYyMRbtwedUyqOl8FUNCWhPxZiO49SSea4HDZ2ik8lrI6hLKq8G7w QIWyxbI3s3uulJJIXQo/VanUKUlQ+PqKQ5P1PF2XWOCdZ1sWM7GWNrBl82dWNLdHaP yJvrpsfXEwnoykLwC80XGBv4WeSRGBv9JZFwTDQnZSRLUwRJ33lpLFh2uPZh4C9tBQ WJ85e2QATXdwQ== 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 4.19 5/6] wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room() Date: Tue, 3 Sep 2024 15:29:25 -0400 Message-ID: <20240903192937.1109185-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903192937.1109185-1-sashal@kernel.org> References: <20240903192937.1109185-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 4.19.320 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 16b614cc16ab5..940018a1f0ee7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -91,6 +91,8 @@ /* adaptive dwell default APs number in social channels (1, 6, 11) */ #define IWL_SCAN_ADWELL_DEFAULT_N_APS_SOCIAL 10 +#define WFA_TPC_IE_LEN 9 + struct iwl_mvm_scan_timing_params { u32 suspend_time; u32 max_out_time; @@ -328,8 +330,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)) @@ -727,8 +729,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