From: Johannes Berg <johannes.berg@xxxxxxxxx>
For different MACs we maintain the configs in different
files, and while it's a small waste of space, this is a
worthwhile trade-off for maintenance and simplicity. So
allow different MAC types to have the same config. This
could allow the same config for two MACs in the same MAC
family, but that's not hugely important. Also simplify
the test to not build a config list, there's no good
reason to do that.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
---
.../wireless/intel/iwlwifi/tests/devinfo.c | 44 +++++++------------
1 file changed, 15 insertions(+), 29 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c b/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
index 575327cd3c92..bf15e8bdc4e8 100644
--- a/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
+++ b/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
@@ -60,41 +60,27 @@ static void devinfo_names(struct kunit *test)
static void devinfo_no_cfg_dups(struct kunit *test)
{
- /* allocate iwl_dev_info_table_size as upper bound */
- const struct iwl_cfg **cfgs = kunit_kcalloc(test,
- iwl_dev_info_table_size,
- sizeof(*cfgs), GFP_KERNEL);
- int p = 0;
-
- KUNIT_ASSERT_NOT_NULL(test, cfgs);
-
- /* build a list of unique (by pointer) configs first */
for (int i = 0; i < iwl_dev_info_table_size; i++) {
- bool found = false;
+ const struct iwl_cfg *cfg_i = iwl_dev_info_table[i].cfg;
- for (int j = 0; j < p; j++) {
- if (cfgs[j] == iwl_dev_info_table[i].cfg) {
- found = true;
- break;
- }
- }
- if (!found) {
- cfgs[p] = iwl_dev_info_table[i].cfg;
- p++;
- }
- }
+ for (int j = 0; j < i; j++) {
+ const struct iwl_cfg *cfg_j = iwl_dev_info_table[j].cfg;
- /* check that they're really all different */
- for (int i = 0; i < p; i++) {
- struct iwl_cfg cfg_i = *cfgs[i];
+ if (cfg_i == cfg_j)
+ continue;
- for (int j = 0; j < i; j++) {
- struct iwl_cfg cfg_j = *cfgs[j];
+ /*
+ * allow different MAC type to have the same config
+ * for better maintenance / file split
+ */
+ if (iwl_dev_info_table[i].mac_type !=
+ iwl_dev_info_table[j].mac_type)
+ continue;
- KUNIT_EXPECT_NE_MSG(test, memcmp(&cfg_i, &cfg_j,
- sizeof(cfg_i)), 0,
+ KUNIT_EXPECT_NE_MSG(test, memcmp(cfg_i, cfg_j,
+ sizeof(*cfg_i)), 0,
"identical configs: %ps and %ps\n",
- cfgs[i], cfgs[j]);
+ cfg_i, cfg_j);
}
}
}
--
2.34.1
