diff options
| author |   Miri Korenblit <miriam.rachel.korenblit@intel.com> | 2025-03-13 00:22:32 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2025-03-18 09:51:25 +0100 |
| commit | 2907c039ff396d43d13ef19b0dbd9b86791f2520 (patch) | |
| tree | f6cf7d8c3b5afe200a841cf7e9bc6114d5c443a1 | |
| parent | wifi: iwlwifi: mld: KUnit: introduce iwl_mld_kunit_link (diff) | |
| download | linux-rng-2907c039ff396d43d13ef19b0dbd9b86791f2520.tar.xz linux-rng-2907c039ff396d43d13ef19b0dbd9b86791f2520.zip | |
wifi: iwlwifi: mld: KUnit: create chanctx with a custom width
Currently iwlmld_kunit_add_chanctx receives a band, picks a predefined
static chandef, and creates the chanctx from it.
Change it to receive a bandwidth as well. Otherwise, the bandwidth in
the chanctx/phy will be different than what test specified in the
iwl_mld_kunit_link.
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20250313002008.85a1285d34cd.Ia71cdcd4241fe73501bc93e3cb2c6bb3f631b9ec@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c index fa2710661bd5..9712ee696509 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c @@ -346,7 +346,8 @@ iwlmld_kunit_setup_assoc(bool mlo, struct iwl_mld_kunit_link *assoc_link) else link = &vif->bss_conf; - chan_ctx = iwlmld_kunit_add_chanctx(assoc_link->band); + chan_ctx = iwlmld_kunit_add_chanctx(assoc_link->band, + assoc_link->bandwidth); wiphy_lock(mld->wiphy); iwlmld_kunit_assign_chanctx_to_link(vif, link, chan_ctx); @@ -427,7 +428,7 @@ struct ieee80211_vif *iwlmld_kunit_assoc_emlsr(struct iwl_mld_kunit_link *link1, link = wiphy_dereference(mld->wiphy, vif->link_conf[link2->id]); KUNIT_EXPECT_NOT_NULL(test, link); - chan_ctx = iwlmld_kunit_add_chanctx(link2->band); + chan_ctx = iwlmld_kunit_add_chanctx(link2->band, link2->bandwidth); iwlmld_kunit_assign_chanctx_to_link(vif, link, chan_ctx); wiphy_unlock(mld->wiphy); diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h b/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h index bb757a7dd8e7..d3723653cf1b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h +++ b/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h @@ -65,24 +65,26 @@ struct ieee80211_chanctx_conf * iwlmld_kunit_add_chanctx_from_def(struct cfg80211_chan_def *def); static inline struct ieee80211_chanctx_conf * -iwlmld_kunit_add_chanctx(enum nl80211_band band) +iwlmld_kunit_add_chanctx(enum nl80211_band band, enum nl80211_chan_width width) { - struct cfg80211_chan_def *chandef; + struct cfg80211_chan_def chandef; switch (band) { case NL80211_BAND_2GHZ: - chandef = &chandef_2ghz; + chandef = chandef_2ghz; break; case NL80211_BAND_5GHZ: - chandef = &chandef_5ghz; + chandef = chandef_5ghz; break; default: case NL80211_BAND_6GHZ: - chandef = &chandef_6ghz; + chandef = chandef_6ghz; break; } - return iwlmld_kunit_add_chanctx_from_def(chandef); + chandef.width = width; + + return iwlmld_kunit_add_chanctx_from_def(&chandef); } void iwlmld_kunit_assign_chanctx_to_link(struct ieee80211_vif *vif, |