wifi: mac80211: add set_active_links variant not locking sdata

There are cases where keeping sdata locked for an operation. Add a
variant that does not take sdata lock to permit these usecases.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index be3294719cb4afec0db5e47ada4c2ae3c2e24209..49461350f909e88d8a88ecc367351fd203609b3c 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -2034,6 +2034,7 @@ void ieee80211_link_stop(struct ieee80211_link_data *link);
 int ieee80211_vif_set_links(struct ieee80211_sub_if_data *sdata,
                            u16 new_links, u16 dormant_links);
 void ieee80211_vif_clear_links(struct ieee80211_sub_if_data *sdata);
+int __ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links);
 
 /* tx handling */
 void ieee80211_clear_tx_pending(struct ieee80211_local *local);

diff --git a/net/mac80211/link.c b/net/mac80211/link.c
index d090ecc41ea2f4cad3f3712762ca4cc9679636b6..6148208b320e3b68f7975c7a2e7a9840bb7f6ff4 100644 (file)
--- a/net/mac80211/link.c
+++ b/net/mac80211/link.c
@@ -447,14 +447,14 @@ static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata,
        return 0;
 }
 
-int ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
+int __ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
 {
        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
        struct ieee80211_local *local = sdata->local;
        u16 old_active;
        int ret;
 
-       sdata_lock(sdata);
+       sdata_assert_lock(sdata);
        mutex_lock(&local->sta_mtx);
        mutex_lock(&local->mtx);
        mutex_lock(&local->key_mtx);
@@ -476,6 +476,17 @@ int ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
        mutex_unlock(&local->key_mtx);
        mutex_unlock(&local->mtx);
        mutex_unlock(&local->sta_mtx);
+
+       return ret;
+}
+
+int ieee80211_set_active_links(struct ieee80211_vif *vif, u16 active_links)
+{
+       struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+       int ret;
+
+       sdata_lock(sdata);
+       ret = __ieee80211_set_active_links(vif, active_links);
        sdata_unlock(sdata);
 
        return ret;