Commit cdaba917 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: follow the new inclusive terminology 



The new inclusive terminology requires to change a few
terms that were used in iwlwifi.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231352.1eb4c8625f36.I1b17b68d4a8e77071da3e15ffbd902d15c1d4938@changeid


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

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

+10 −10
Original line number Diff line number Diff line
@@ -229,8 +229,8 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, 
IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

		     __le32 *black_list_array,

		     int *black_list_size)

		     __le32 *block_list_array,

		     int *block_list_size)

{

	union acpi_object *wifi_pkg, *data;

	int ret, tbl_rev, i;
@@ -257,7 +257,7 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
	enabled = !!wifi_pkg->package.elements[0].integer.value;



	if (!enabled) {

		*black_list_size = -1;

		*block_list_size = -1;

		IWL_DEBUG_RADIO(fwrt, "TAS not enabled\n");

		ret = 0;

		goto out_free;
@@ -271,17 +271,17 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
		ret = -EINVAL;

		goto out_free;

	}

	*black_list_size = wifi_pkg->package.elements[1].integer.value;

	*block_list_size = wifi_pkg->package.elements[1].integer.value;



	IWL_DEBUG_RADIO(fwrt, "TAS array size %d\n", *black_list_size);

	if (*black_list_size > APCI_WTAS_BLACK_LIST_MAX) {

	IWL_DEBUG_RADIO(fwrt, "TAS array size %d\n", *block_list_size);

	if (*block_list_size > APCI_WTAS_BLACK_LIST_MAX) {

		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size value %u\n",

				*black_list_size);

				*block_list_size);

		ret = -EINVAL;

		goto out_free;

	}



	for (i = 0; i < *black_list_size; i++) {

	for (i = 0; i < *block_list_size; i++) {

		u32 country;



		if (wifi_pkg->package.elements[2 + i].type !=
@@ -293,8 +293,8 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
		}



		country = wifi_pkg->package.elements[2 + i].integer.value;

		black_list_array[i] = cpu_to_le32(country);

		IWL_DEBUG_RADIO(fwrt, "TAS black list country %d\n", country);

		block_list_array[i] = cpu_to_le32(country);

		IWL_DEBUG_RADIO(fwrt, "TAS block list country %d\n", country);

	}



	ret = 0;

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

+5 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
#define ACPI_ECKV_WIFI_DATA_SIZE	2



/*

 * 1 type, 1 enabled, 1 black list size, 16 black list array

 * 1 type, 1 enabled, 1 block list size, 16 block list array

 */

#define APCI_WTAS_BLACK_LIST_MAX	16

#define ACPI_WTAS_WIFI_DATA_SIZE	(3 + APCI_WTAS_BLACK_LIST_MAX)
@@ -197,8 +197,8 @@ bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt); 
int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,

		     struct iwl_per_chain_offset *table, u32 n_bands);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, __le32 *black_list_array,

		     int *black_list_size);

int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, __le32 *block_list_array,

		     int *block_list_size);



#else /* CONFIG_ACPI */
@@ -269,8 +269,8 @@ static inline bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt) 
}



static inline int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

				   __le32 *black_list_array,

				   int *black_list_size)

				   __le32 *block_list_array,

				   int *block_list_size)

{

	return -ENOENT;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ enum iwl_legacy_cmds { 


	/**

	 * @SCAN_OFFLOAD_UPDATE_PROFILES_CMD:

	 * update scan offload (scheduled scan) profiles/blacklist/etc.

	 * update scan offload (scheduled scan) profiles/blocklist/etc.

	 */

	SCAN_OFFLOAD_UPDATE_PROFILES_CMD = 0x6E,

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+4 −4
Original line number Diff line number Diff line
@@ -449,12 +449,12 @@ enum iwl_mcc_source { 
#define IWL_TAS_BLACK_LIST_MAX 16

/**

 * struct iwl_tas_config_cmd - configures the TAS

 * @black_list_size: size of relevant field in black_list_array

 * @black_list_array: black list countries (without TAS)

 * @block_list_size: size of relevant field in block_list_array

 * @block_list_array: block list countries (without TAS)

 */

struct iwl_tas_config_cmd {

	__le32 black_list_size;

	__le32 black_list_array[IWL_TAS_BLACK_LIST_MAX];

	__le32 block_list_size;

	__le32 block_list_array[IWL_TAS_BLACK_LIST_MAX];

} __packed; /* TAS_CONFIG_CMD_API_S_VER_2 */



/**

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

+6 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -117,12 +117,12 @@ enum scan_framework_client { 
};



/**

 * struct iwl_scan_offload_blacklist - SCAN_OFFLOAD_BLACKLIST_S

 * struct iwl_scan_offload_blocklist - SCAN_OFFLOAD_BLACKLIST_S

 * @ssid:		MAC address to filter out

 * @reported_rssi:	AP rssi reported to the host

 * @client_bitmap: clients ignore this entry  - enum scan_framework_client

 */

struct iwl_scan_offload_blacklist {

struct iwl_scan_offload_blocklist {

	u8 ssid[ETH_ALEN];

	u8 reported_rssi;

	u8 client_bitmap;
@@ -162,7 +162,7 @@ struct iwl_scan_offload_profile { 


/**

 * struct iwl_scan_offload_profile_cfg_data

 * @blacklist_len:	length of blacklist

 * @blocklist_len:	length of blocklist

 * @num_profiles:	num of profiles in the list

 * @match_notify:	clients waiting for match found notification

 * @pass_match:		clients waiting for the results
@@ -171,7 +171,7 @@ struct iwl_scan_offload_profile { 
 * @reserved:		reserved

 */

struct iwl_scan_offload_profile_cfg_data {

	u8 blacklist_len;

	u8 blocklist_len;

	u8 num_profiles;

	u8 match_notify;

	u8 pass_match;