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

Commit 0d5bad14 authored by Ihab Zhaika's avatar Ihab Zhaika Committed by Luca Coelho
Browse files

iwlwifi: rename structs to fit the new names 



rename few structs to fit the new marketing names

Signed-off-by: default avatarIhab Zhaika <ihab.zhaika@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 07d35b42

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

+6 −6
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl22260_2ax_cfg = {

	.name = "Intel(R) Wireless-AX 22260",

const struct iwl_cfg iwl_ax200_cfg_cc = {

	.name = "Intel(R) Wi-Fi 6 AX200 160MHz",

	.fw_name_pre = IWL_CC_A_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -249,7 +249,7 @@ const struct iwl_cfg iwl22260_2ax_cfg = { 
};



const struct iwl_cfg killer1650x_2ax_cfg = {

	.name = "Killer(R) Wireless-AX 1650x Wireless Network Adapter (200NGW)",

	.name = "Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)",

	.fw_name_pre = IWL_CC_A_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -262,7 +262,7 @@ const struct iwl_cfg killer1650x_2ax_cfg = { 
};



const struct iwl_cfg killer1650w_2ax_cfg = {

	.name = "Killer(R) Wireless-AX 1650w Wireless Network Adapter (200D2W)",

	.name = "Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)",

	.fw_name_pre = IWL_CC_A_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -328,7 +328,7 @@ const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0 = { 
};



const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {

	.name = "Killer(R) Wireless-AX 1650i Wireless Network Adapter (22560NGW)",

	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -340,7 +340,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = { 
};



const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {

	.name = "Killer(R) Wireless-AX 1650s Wireless Network Adapter (22560D2W)",

	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

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

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb; 
extern const struct iwl_cfg iwl22000_2ac_cfg_jf;

extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;

extern const struct iwl_cfg iwl22000_2ax_cfg_hr;

extern const struct iwl_cfg iwl22260_2ax_cfg;

extern const struct iwl_cfg iwl_ax200_cfg_cc;

extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;

extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0;

extern const struct iwl_cfg killer1650x_2ax_cfg;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+6 −6
Original line number Diff line number Diff line
@@ -953,14 +953,14 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},

	{IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl_ax101_cfg_qu_hr)},



	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl22260_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl22260_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl22260_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl22260_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl_ax200_cfg_cc)},

	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl_ax200_cfg_cc)},

	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl_ax200_cfg_cc)},

	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl_ax200_cfg_cc)},

	{IWL_PCI_DEVICE(0x2723, 0x1653, killer1650w_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x1654, killer1650x_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl22260_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl22260_2ax_cfg)},

	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl_ax200_cfg_cc)},

	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl_ax200_cfg_cc)},



	{IWL_PCI_DEVICE(0x1a56, 0x1653, killer1650w_2ax_cfg)},

	{IWL_PCI_DEVICE(0x1a56, 0x1654, killer1650x_2ax_cfg)},

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+1 −1
Original line number Diff line number Diff line
@@ -3561,7 +3561,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
		}

	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==

		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&

		   (trans->cfg != &iwl22260_2ax_cfg ||

		   (trans->cfg != &iwl_ax200_cfg_cc ||

		    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {

		u32 hw_status;