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

wifi: iwlwifi: remove TH/TH1 RF types

Browse Source 
There are the same values as JF2/JF1 respectively, and
that really matches the code names. Remove TH/TH1.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502151751.7677cffdfae2.Idd76734c310cf5f27de43d24e71b27467ab5905a@changeid
This commit is contained in:
Johannes Berg
2025-05-02 15:20:17 +03:00
committed by Miri Korenblit
parent c577684874
commit a7872d8061
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,8 +432,6 @@ struct iwl_cfg {
#define IWL_CFG_MAC_TYPE_BR 0x4C
#define IWL_CFG_MAC_TYPE_DR 0x4D
#define IWL_CFG_RF_TYPE_TH 0x105
#define IWL_CFG_RF_TYPE_TH1 0x108
#define IWL_CFG_RF_TYPE_JF2 0x105
#define IWL_CFG_RF_TYPE_JF1 0x108
#define IWL_CFG_RF_TYPE_HR2 0x10A

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

@@ -903,24 +903,24 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
BW_LIMIT(80), CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9270_160_name, DEVICE(0x2526),
MAC_TYPE(TH), RF_TYPE(TH),
MAC_TYPE(TH), RF_TYPE(JF2),
BW_NO_LIMIT, CORES(BT_GNSS), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9270_name, DEVICE(0x2526),
MAC_TYPE(TH), RF_TYPE(TH),
MAC_TYPE(TH), RF_TYPE(JF2),
BW_LIMIT(80), CORES(BT_GNSS), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9162_160_name, DEVICE(0x271B),
MAC_TYPE(TH), RF_TYPE(TH1),
MAC_TYPE(TH), RF_TYPE(JF1),
BW_NO_LIMIT, CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9162_name, DEVICE(0x271B),
MAC_TYPE(TH), RF_TYPE(TH1),
MAC_TYPE(TH), RF_TYPE(JF1),
BW_LIMIT(80), CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9260_160_name, DEVICE(0x2526),
MAC_TYPE(TH), RF_TYPE(TH),
MAC_TYPE(TH), RF_TYPE(JF2),
BW_NO_LIMIT, CORES(BT), NO_CDB),
IWL_DEV_INFO(iwl9260_2ac_cfg, iwl9260_name, DEVICE(0x2526),
MAC_TYPE(TH), RF_TYPE(TH),
MAC_TYPE(TH), RF_TYPE(JF2),
BW_LIMIT(80), CORES(BT), NO_CDB),
/* Qu with Jf */