wifi: mac80211: Refactor ieee80211_sta_wmm_params()

The function first updates the link configuration and then
calls the driver to set the link parameters. Since the call
to the driver might sleep, split the function such that
the link configuration could be done without calling the
driver. This would be useful in cases that WMM parameters
need to be configured, but the current locking doesn't allow
to call the driver.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250205110958.b1cedcf93763.I65783c102d44127035838f97fab64ec4df5c40f3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f8d52b3b0d0e4cf1beefc7e0ca8de385d68d2c36..6feb4ce2c90d5392b814408c90ad763de6d7a850 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3375,10 +3375,10 @@ void ieee80211_mgd_set_link_qos_params(struct ieee80211_link_data *link)
 
 /* MLME */
 static bool
-ieee80211_sta_wmm_params(struct ieee80211_local *local,
-                        struct ieee80211_link_data *link,
-                        const u8 *wmm_param, size_t wmm_param_len,
-                        const struct ieee80211_mu_edca_param_set *mu_edca)
+_ieee80211_sta_wmm_params(struct ieee80211_local *local,
+                         struct ieee80211_link_data *link,
+                         const u8 *wmm_param, size_t wmm_param_len,
+                         const struct ieee80211_mu_edca_param_set *mu_edca)
 {
        struct ieee80211_sub_if_data *sdata = link->sdata;
        struct ieee80211_tx_queue_params params[IEEE80211_NUM_ACS];
@@ -3507,6 +3507,19 @@ ieee80211_sta_wmm_params(struct ieee80211_local *local,
        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
                link->tx_conf[ac] = params[ac];
 
+       return true;
+}
+
+static bool
+ieee80211_sta_wmm_params(struct ieee80211_local *local,
+                        struct ieee80211_link_data *link,
+                        const u8 *wmm_param, size_t wmm_param_len,
+                        const struct ieee80211_mu_edca_param_set *mu_edca)
+{
+       if (!_ieee80211_sta_wmm_params(local, link, wmm_param, wmm_param_len,
+                                      mu_edca))
+               return false;
+
        ieee80211_mgd_set_link_qos_params(link);
 
        /* enable WMM or activate new settings */