Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5307eca1 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git 

Stephen Rothwell reported quite a few conflicts in iwlwifi between
wireless-drivers and wireless-drivers-next. To avoid any problems later in
other trees merge w-d to w-d-next to fix those conflicts early.
parents 2c1dca3c e9bf53ab

drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c

+4 −2
Original line number Diff line number Diff line
@@ -159,7 +159,9 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) 


	brcmf_feat_firmware_capabilities(ifp);

	memset(&gscan_cfg, 0, sizeof(gscan_cfg));

	brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN, "pfn_gscan_cfg",

	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID)

		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,

					  "pfn_gscan_cfg",

					  &gscan_cfg, sizeof(gscan_cfg));

	brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_PNO, "pfn");

	if (drvr->bus_if->wowl_supported)

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+7 −7
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
const struct iwl_cfg iwl9160_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9160",

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_next_step = IWL9260B_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -165,7 +165,7 @@ const struct iwl_cfg iwl9160_2ac_cfg = { 
const struct iwl_cfg iwl9260_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9260",

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_next_step = IWL9260B_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -176,7 +176,7 @@ const struct iwl_cfg iwl9260_2ac_cfg = { 
const struct iwl_cfg iwl9270_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9270",

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_next_step = IWL9260B_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -186,8 +186,8 @@ const struct iwl_cfg iwl9270_2ac_cfg = { 


const struct iwl_cfg iwl9460_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9460",

	.fw_name_pre = IWL9000_FW_PRE,

	.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,
@@ -198,8 +198,8 @@ const struct iwl_cfg iwl9460_2ac_cfg = { 


const struct iwl_cfg iwl9560_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9560",

	.fw_name_pre = IWL9000_FW_PRE,

	.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,

	.fw_name_pre = IWL9260A_FW_PRE,

	.fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

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

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_TX_POWER_ACK: reduced TX power API has larger

 *	command size (command version 4) that supports toggling ACK TX

 *	power reduction.

 * @IWL_UCODE_TLV_CAPA_MLME_OFFLOAD: supports MLME offload

 *

 * @NUM_IWL_UCODE_TLV_CAPA: number of bits used

 */
@@ -377,6 +378,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG	= (__force iwl_ucode_tlv_capa_t)80,

	IWL_UCODE_TLV_CAPA_LQM_SUPPORT			= (__force iwl_ucode_tlv_capa_t)81,

	IWL_UCODE_TLV_CAPA_TX_POWER_ACK			= (__force iwl_ucode_tlv_capa_t)84,

	IWL_UCODE_TLV_CAPA_MLME_OFFLOAD			= (__force iwl_ucode_tlv_capa_t)96,



	NUM_IWL_UCODE_TLV_CAPA

#ifdef __CHECKER__

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+4 −4
Original line number Diff line number Diff line
@@ -276,10 +276,10 @@ struct iwl_pwr_tx_backoff { 
 * @fw_name_pre: Firmware filename prefix. The api version and extension

 *	(.ucode) will be added to filename before loading from disk. The

 *	filename is constructed as fw_name_pre<api>.ucode.

 * @fw_name_pre_next_step: same as @fw_name_pre, only for next step

 * @fw_name_pre_b_or_c_step: same as @fw_name_pre, only for b or c steps

 *	(if supported)

 * @fw_name_pre_rf_next_step: same as @fw_name_pre_next_step, only for rf next

 *	step. Supported only in integrated solutions.

 * @fw_name_pre_rf_next_step: same as @fw_name_pre_b_or_c_step, only for rf

 *	next step. Supported only in integrated solutions.

 * @ucode_api_max: Highest version of uCode API supported by driver.

 * @ucode_api_min: Lowest version of uCode API supported by driver.

 * @max_inst_size: The maximal length of the fw inst section
@@ -330,7 +330,7 @@ struct iwl_cfg { 
	/* params specific to an individual device within a device family */

	const char *name;

	const char *fw_name_pre;

	const char *fw_name_pre_next_step;

	const char *fw_name_pre_b_or_c_step;

	const char *fw_name_pre_rf_next_step;

	/* params not likely to change within a device family */

	const struct iwl_base_params *base_params;

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+3 −2
Original line number Diff line number Diff line
@@ -216,8 +216,9 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) 
	const char *fw_pre_name;



	if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_9000 &&

	    CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_B_STEP)

		fw_pre_name = cfg->fw_name_pre_next_step;

	    (CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_B_STEP ||

	     CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_C_STEP))

		fw_pre_name = cfg->fw_name_pre_b_or_c_step;

	else if (drv->trans->cfg->integrated &&

		 CSR_HW_RFID_STEP(drv->trans->hw_rf_id) == SILICON_B_STEP &&

		 cfg->fw_name_pre_rf_next_step)