]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: iwlwifi: fix build when mvm/mld not configured
authorJohannes Berg <johannes.berg@intel.com>
Sun, 19 Oct 2025 08:45:08 +0000 (11:45 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Tue, 28 Oct 2025 14:17:26 +0000 (16:17 +0200)
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
drivers/net/wireless/intel/iwlwifi/tests/devinfo.c

index 3054bc0a9c67965b688c00a73e2cca34ff706112..6bf2ad18b009116e0862fc0d4eb470bac91e2f1c 100644 (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);