wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room()

[ Upstream commit 916a5d9c5354c426220a0a6533a5e8ea1287d6ea ]

Driver creates also the WFA TPC element, consider that in the
calculation.

Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240825191257.e710ce446b7f.I2715c6742e9c3d160e2ba41bc4b35de370d2ce34@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index c61068144c6386cda61d6a81a50e8807f2747eaa..626620cd892f0074df51d46bd24e56fee7ede720 100644 (file)
--- 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;