mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 17:17:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

wifi: iwlwifi: cfg: unify Killer 1650s/i with Qu/Hr

Browse Source 
These configs are the same except for the name, but we
can use a separate per-device name to override the name.
So do that, and remove the separate configs.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502151751.a0a8ebbd473a.Iad8bff04138538a8bc9f7920077ea24a699b1ed4@changeid
This commit is contained in:
Johannes Berg
2025-05-02 15:20:25 +03:00
committed by Miri Korenblit
parent 0775d2c639
commit ef36fd5f0c
3 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/wireless/intel/iwlwifi/cfg/22000.c
View File

@@ -257,30 +257,6 @@ const struct iwl_cfg iwl_ax200_cfg_cc = {
.num_rbds = IWL_NUM_RBDS_22000_HE,
};
const struct iwl_cfg killer1650s_2ax_cfg_qu_hr = {
.name = iwl_ax201_killer_1650s_name,
IWL_DEVICE_22500,
/*
* This device doesn't support receiving BlockAck with a large bitmap
* so we need to restrict the size of transmitted aggregation to the
* HT size; mac80211 would otherwise pick the HE max (256) by default.
*/
.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
.num_rbds = IWL_NUM_RBDS_22000_HE,
};
const struct iwl_cfg killer1650i_2ax_cfg_qu_hr = {
.name = iwl_ax201_killer_1650i_name,
IWL_DEVICE_22500,
/*
* This device doesn't support receiving BlockAck with a large bitmap
* so we need to restrict the size of transmitted aggregation to the
* HT size; mac80211 would otherwise pick the HE max (256) by default.
*/
.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
.num_rbds = IWL_NUM_RBDS_22000_HE,
};
MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

2
drivers/net/wireless/intel/iwlwifi/iwl-config.h
View File

@@ -626,8 +626,6 @@ extern const struct iwl_cfg iwl_qu_hr1;
extern const struct iwl_cfg iwl_qu_hr;
extern const struct iwl_cfg iwl_ax200_cfg_cc;
extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;
extern const struct iwl_cfg killer1650s_2ax_cfg_qu_hr;
extern const struct iwl_cfg killer1650i_2ax_cfg_qu_hr;
extern const struct iwl_cfg killer1650x_2ax_cfg;
extern const struct iwl_cfg killer1650w_2ax_cfg;
extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0;

30
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
View File

@@ -655,11 +655,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x43F0), SUBDEV(0x0078), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x43F0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr,
iwl_ax201_killer_1650s_name,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0x43F0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr,
iwl_ax201_killer_1650i_name,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0x43F0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x43F0), SUBDEV(0x2074), BW_NO_LIMIT),
@@ -675,9 +673,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0xA0F0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0xA0F0), SUBDEV(0x0A10), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0xA0F0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0xA0F0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0xA0F0), SUBDEV(0x2074), BW_NO_LIMIT),
@@ -697,9 +695,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x02F0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x02F0), SUBDEV(0x0310), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0x02F0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0x02F0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x02F0), SUBDEV(0x2074), BW_NO_LIMIT),
@@ -715,9 +713,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x06F0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x06F0), SUBDEV(0x0310), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0x06F0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0x06F0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x06F0), SUBDEV(0x2074), BW_NO_LIMIT),
@@ -733,9 +731,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x34F0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x34F0), SUBDEV(0x0310), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0x34F0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0x34F0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x34F0), SUBDEV(0x2074), BW_NO_LIMIT),
@@ -752,9 +750,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x3DF0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x3DF0), SUBDEV(0x0310), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0x3DF0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0x3DF0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x3DF0), SUBDEV(0x2074), BW_NO_LIMIT),
@@ -771,9 +769,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x4DF0), SUBDEV(0x007C), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x4DF0), SUBDEV(0x0310), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650s_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650s_name,
DEVICE(0x4DF0), SUBDEV(0x1651), BW_NO_LIMIT),
IWL_DEV_INFO(killer1650i_2ax_cfg_qu_hr, NULL,
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, iwl_ax201_killer_1650i_name,
DEVICE(0x4DF0), SUBDEV(0x1652), BW_NO_LIMIT),
IWL_DEV_INFO(iwl_ax201_cfg_qu_hr, NULL,
DEVICE(0x4DF0), SUBDEV(0x2074), BW_NO_LIMIT),