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

wifi: iwlwifi: cfg: reduce mac_type to u8 



In theory, this should be 12 bits, but in practice all the
values we use now fit into 8 bits, so change the mac_type to
make room in struct iwl_dev_info.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250502155404.c17d56f4ae0f.I487c8df18aa33c46aa6813bf5aebb5a23da67600@changeid
parent 220c01a6

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

+2 −2
Original line number Diff line number Diff line
@@ -459,8 +459,8 @@ struct iwl_cfg { 
struct iwl_dev_info {

	u16 device;

	u16 subdevice;

	u16 mac_type;

	u16 rf_type;

	u8 mac_type;

	u8 bw_limit;

	u8 mac_step;

	u8 rf_step;
@@ -477,7 +477,7 @@ extern const struct iwl_dev_info iwl_dev_info_table[]; 
extern const unsigned int iwl_dev_info_table_size;

const struct iwl_dev_info *

iwl_pci_find_dev_info(u16 device, u16 subsystem_device,

		      u16 mac_type, u8 mac_step, u16 rf_type, u8 cdb,

		      u8 mac_type, u8 mac_step, u16 rf_type, u8 cdb,

		      u8 jacket, u8 rf_id, u8 bw_limit, u8 cores, u8 rf_step);

extern const struct pci_device_id iwl_hw_card_ids[];

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ static int map_crf_id(struct iwl_trans *iwl_trans) 


VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info *

iwl_pci_find_dev_info(u16 device, u16 subsystem_device,

		      u16 mac_type, u8 mac_step, u16 rf_type, u8 cdb,

		      u8 mac_type, u8 mac_step, u16 rf_type, u8 cdb,

		      u8 jacket, u8 rf_id, u8 bw_limit, u8 cores, u8 rf_step)

{

	int num_devices = ARRAY_SIZE(iwl_dev_info_table);
@@ -2123,7 +2123,7 @@ iwl_pci_find_dev_info(u16 device, u16 subsystem_device, 
		    dev_info->subdevice != subsystem_device)

			continue;



		if (dev_info->mac_type != (u16)IWL_CFG_ANY &&

		if (dev_info->mac_type != (u8)IWL_CFG_ANY &&

		    dev_info->mac_type != mac_type)

			continue;