Commit 8932abef authored by Matti Gottlieb's avatar Matti Gottlieb Committed by Luca Coelho
Browse files

iwlwifi: pcie: Change ma product string name 



Change ma product string name to the correct name,
and to reflect the CRF and not the CNV.

Signed-off-by: default avatarMatti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210411132130.c05b4c55540f.I8dd0361b033f63658999ba53640949701b048f17@changeid


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

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

+1 −1
Original line number Diff line number Diff line
@@ -388,8 +388,8 @@ const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz"; 
const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";

const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";

const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";

const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz";

const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";

const char iwl_ma_name[] = "Intel(R) Wi-Fi 6";



const char iwl_ax200_killer_1650w_name[] =

	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";

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

+1 −1
Original line number Diff line number Diff line
@@ -505,8 +505,8 @@ extern const char iwl_ax201_killer_1650s_name[]; 
extern const char iwl_ax201_killer_1650i_name[];

extern const char iwl_ax210_killer_1675w_name[];

extern const char iwl_ax210_killer_1675x_name[];

extern const char iwl_ma_name[];

extern const char iwl_ax211_name[];

extern const char iwl_ax221_name[];

extern const char iwl_ax411_name[];

#if IS_ENABLED(CONFIG_IWLDVM)

extern const struct iwl_cfg iwl5300_agn_cfg;

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

+3 −3
Original line number Diff line number Diff line
@@ -1028,12 +1028,12 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_a0_mr_a0, iwl_ma_name),

		      iwl_cfg_ma_a0_mr_a0, iwl_ax221_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_snj_a0_mr_a0, iwl_ma_name),

		      iwl_cfg_snj_a0_mr_a0, iwl_ax221_name),



/* So with Hr */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1101,7 +1101,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_mr_a0, iwl_ma_name),

		      iwl_cfg_bz_a0_mr_a0, iwl_ax211_name),



/* So with GF */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,