admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: iwlwifi: fix build when mvm/mld not configured

Browse Source 
When neither mvm nor mld are configured, we don't have the
iwl_bz_mac_cfg symbol and thus cannot check for it. But in
that case the relevant device entries aren't and cannot be
present, so just ifdef the test code for that.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202509170625.BAJBe7Bi-lkp@intel.com/
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251019114304.615810979e7b.I9a215f955bb3208d99239be8496d19e0f186b4d0@changeid
This commit is contained in:
Johannes Berg
2025-10-19 11:45:08 +03:00
committed by Miri Korenblit
parent 7906c61a8f
commit f67cf9aaae
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
View File

@@ -274,6 +274,7 @@ static void devinfo_pci_ids_config(struct kunit *test)
if (s->device == PCI_ANY_ID || s->subdevice == PCI_ANY_ID)
continue;
#if IS_ENABLED(CONFIG_IWLMVM) || IS_ENABLED(CONFIG_IWLMLD)
/*
* The check below only works for old (pre-CNVI) devices. Most
* new have subdevice==ANY, so are already skipped, but for some
@@ -281,6 +282,7 @@ static void devinfo_pci_ids_config(struct kunit *test)
*/
if (s->driver_data == (kernel_ulong_t)&iwl_bz_mac_cfg)
continue;
#endif
di = iwl_pci_find_dev_info(s->device, s->subdevice,
0, 0, 0, 0, true);