Commit f0b71876 authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: cfg: remove fw_name_mac 



Instead of having fw_name_mac in the config, derive it
from the MAC type instead.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502151751.8dba9a2d3546.I41fa594d6a0be163444b90c1ed4b441a949d3899@changeid
parent fa22a93e

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

+0 −11
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { 
 * 9560 nevertheless.

 */

const struct iwl_cfg iwl9560_qu_jf_cfg = {

	.fw_name_mac = "Qu",

	IWL_DEVICE_22500,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};
@@ -212,7 +211,6 @@ const char iwl_ax201_killer_1650i_name[] = 
	"Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)";



const struct iwl_cfg iwl_qu_hr1 = {

	.fw_name_mac = "Qu",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -225,7 +223,6 @@ const struct iwl_cfg iwl_qu_hr1 = { 
};



const struct iwl_cfg iwl_qu_hr = {

	.fw_name_mac = "Qu",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -238,7 +235,6 @@ const struct iwl_cfg iwl_qu_hr = { 


const struct iwl_cfg iwl_ax201_cfg_qu_hr = {

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

	.fw_name_mac = "Qu",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -250,7 +246,6 @@ const struct iwl_cfg iwl_ax201_cfg_qu_hr = { 
};



const struct iwl_cfg iwl_quz_hr1 = {

	.fw_name_mac = "QuZ",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -264,7 +259,6 @@ const struct iwl_cfg iwl_quz_hr1 = { 


const struct iwl_cfg iwl_ax201_cfg_quz_hr = {

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

	.fw_name_mac = "QuZ",

	IWL_DEVICE_22500,

	/*

         * This device doesn't support receiving BlockAck with a large bitmap
@@ -277,7 +271,6 @@ const struct iwl_cfg iwl_ax201_cfg_quz_hr = { 


const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = {

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

	.fw_name_mac = "QuZ",

	IWL_DEVICE_22500,

	/*

         * This device doesn't support receiving BlockAck with a large bitmap
@@ -290,7 +283,6 @@ const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = { 


const struct iwl_cfg iwl_ax1650i_cfg_quz_hr = {

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

	.fw_name_mac = "QuZ",

	IWL_DEVICE_22500,

	/*

         * This device doesn't support receiving BlockAck with a large bitmap
@@ -315,7 +307,6 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 


const struct iwl_cfg killer1650s_2ax_cfg_qu_hr = {

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

	.fw_name_mac = "Qu",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -328,7 +319,6 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_hr = { 


const struct iwl_cfg killer1650i_2ax_cfg_qu_hr = {

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

	.fw_name_mac = "Qu",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -340,7 +330,6 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_hr = { 
};



const struct iwl_cfg iwl_cfg_quz_hr = {

	.fw_name_mac = "QuZ",

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

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

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

/*

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2024 Intel Corporation

 * Copyright (C) 2018-2025 Intel Corporation

 */

#include <linux/module.h>

#include <linux/stringify.h>
@@ -248,7 +248,6 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = { 
};



const struct iwl_cfg iwl_cfg_ma = {

	.fw_name_mac = "ma",

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

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

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ const char iwl_gl_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz"; 
const char iwl_mtp_name[] = "Intel(R) Wi-Fi 7 BE202 160MHz";



const struct iwl_cfg iwl_cfg_bz = {

	.fw_name_mac = "bz",

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,
@@ -171,7 +170,6 @@ const struct iwl_cfg iwl_cfg_bz = { 
};



const struct iwl_cfg iwl_cfg_gl = {

	.fw_name_mac = "gl",

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

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

+0 −2
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ const struct iwl_cfg_trans_params iwl_dr_trans_cfg = { 
const char iwl_dr_name[] = "Intel(R) TBD Dr device";



const struct iwl_cfg iwl_cfg_dr = {

	.fw_name_mac = "dr",

	IWL_DEVICE_DR,

};
@@ -156,7 +155,6 @@ const struct iwl_cfg_trans_params iwl_br_trans_cfg = { 
const char iwl_br_name[] = "Intel(R) TBD Br device";



const struct iwl_cfg iwl_cfg_br = {

	.fw_name_mac = "br",

	IWL_DEVICE_DR,

};

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

+0 −3
Original line number Diff line number Diff line
@@ -146,17 +146,14 @@ const char iwl_sp_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz"; 
const char iwl_pe_name[] = "Intel(R) Wi-Fi 8 BN201";



const struct iwl_cfg iwl_cfg_sc = {

	.fw_name_mac = "sc",

	IWL_DEVICE_SC,

};



const struct iwl_cfg iwl_cfg_sc2 = {

	.fw_name_mac = "sc2",

	IWL_DEVICE_SC,

};



const struct iwl_cfg iwl_cfg_sc2f = {

	.fw_name_mac = "sc2f",

	IWL_DEVICE_SC,

};