Commit 35fc5fec authored by Ilan Peer's avatar Ilan Peer Committed by Luca Coelho
Browse files

iwlwifi: mvm: Fix umac scan request probe parameters 



Both 'iwl_scan_probe_params_v3' and 'iwl_scan_probe_params_v4'
wrongly addressed the 'bssid_array' field which should supposed
to be any array of BSSIDs each of size ETH_ALEN and not the
opposite. Fix it.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210802215208.04146f24794f.I90726440ddff75013e9fecbe9fa1a05c69e3f17b@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9de168a0

drivers/net/wireless/intel/iwlwifi/fw/api/scan.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -874,7 +874,7 @@ struct iwl_scan_probe_params_v3 { 
	u8 reserved;

	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];

	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];

	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];

	u8 bssid_array[SCAN_BSSID_MAX_SIZE][ETH_ALEN];

} __packed; /* SCAN_PROBE_PARAMS_API_S_VER_3 */



/**
@@ -894,7 +894,7 @@ struct iwl_scan_probe_params_v4 { 
	__le16 reserved;

	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];

	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];

	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];

	u8 bssid_array[SCAN_BSSID_MAX_SIZE][ETH_ALEN];

} __packed; /* SCAN_PROBE_PARAMS_API_S_VER_4 */



#define SCAN_MAX_NUM_CHANS_V3 67