cfg80211/mac80211: use cfg80211 wdev mutex in mac80211

Using separate locks in cfg80211 and mac80211 has always
caused issues, for example having to unlock in places in
mac80211 to call cfg80211, which even needed a framework
to make cfg80211 calls after some functions returned etc.

Additionally, I suspect some issues people have reported
with the cfg80211 state getting confused could be due to
such issues, when cfg80211 is asking mac80211 to change
state but mac80211 is in the process of telling cfg80211
that the state changed (in another way.)

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

1 files changed, 15 insertions, 24 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 956ba6316da5..caa4b4f7f6e4 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -54,7 +54,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         struct beacon_data *presp;
         int frame_len;
 
-        lockdep_assert_held(&ifibss->mtx);
+        sdata_assert_lock(sdata);
 
         /* Reset own TSF to allow time synchronization work. */
         drv_reset_tsf(local, sdata);
@@ -74,7 +74,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         }
 
         presp = rcu_dereference_protected(ifibss->presp,
-                                          lockdep_is_held(&ifibss->mtx));
+                                          lockdep_is_held(&sdata->wdev.mtx));
         rcu_assign_pointer(ifibss->presp, NULL);
         if (presp)
                 kfree_rcu(presp, rcu_head);
@@ -263,7 +263,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         const struct cfg80211_bss_ies *ies;
         u64 tsf;
 
-        lockdep_assert_held(&sdata->u.ibss.mtx);
+        sdata_assert_lock(sdata);
 
         if (beacon_int < 10)
                 beacon_int = 10;
@@ -410,7 +410,7 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
         struct sta_info *sta;
         u8 deauth_frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
 
-        lockdep_assert_held(&sdata->u.ibss.mtx);
+        sdata_assert_lock(sdata);
 
         if (len < 24 + 6)
                 return;
@@ -677,7 +677,7 @@ static int ieee80211_sta_active_ibss(struct ieee80211_sub_if_data *sdata)
         int active = 0;
         struct sta_info *sta;
 
-        lockdep_assert_held(&sdata->u.ibss.mtx);
+        sdata_assert_lock(sdata);
 
         rcu_read_lock();
 
@@ -703,7 +703,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        lockdep_assert_held(&ifibss->mtx);
+        sdata_assert_lock(sdata);
 
         mod_timer(&ifibss->timer,
                   round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL));
@@ -734,7 +734,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
         u16 capability;
         int i;
 
-        lockdep_assert_held(&ifibss->mtx);
+        sdata_assert_lock(sdata);
 
         if (ifibss->fixed_bssid) {
                 memcpy(bssid, ifibss->bssid, ETH_ALEN);
@@ -777,7 +777,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
         int active_ibss;
         u16 capability;
 
-        lockdep_assert_held(&ifibss->mtx);
+        sdata_assert_lock(sdata);
 
         active_ibss = ieee80211_sta_active_ibss(sdata);
         ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss);
@@ -847,10 +847,10 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
         struct beacon_data *presp;
         u8 *pos, *end;
 
-        lockdep_assert_held(&ifibss->mtx);
+        sdata_assert_lock(sdata);
 
         presp = rcu_dereference_protected(ifibss->presp,
-                                          lockdep_is_held(&ifibss->mtx));
+                                          lockdep_is_held(&sdata->wdev.mtx));
 
         if (ifibss->state != IEEE80211_IBSS_MLME_JOINED ||
             len < 24 + 2 || !presp)
@@ -934,7 +934,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
         mgmt = (struct ieee80211_mgmt *) skb->data;
         fc = le16_to_cpu(mgmt->frame_control);
 
-        mutex_lock(&sdata->u.ibss.mtx);
+        sdata_lock(sdata);
 
         if (!sdata->u.ibss.ssid_len)
                 goto mgmt_out; /* not ready to merge yet */
@@ -957,7 +957,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
         }
 
  mgmt_out:
-        mutex_unlock(&sdata->u.ibss.mtx);
+        sdata_unlock(sdata);
 }
 
 void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
@@ -965,7 +965,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
         struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
         struct sta_info *sta;
 
-        mutex_lock(&ifibss->mtx);
+        sdata_lock(sdata);
 
         /*
          * Work could be scheduled after scan or similar
@@ -1001,7 +1001,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
         }
 
  out:
-        mutex_unlock(&ifibss->mtx);
+        sdata_unlock(sdata);
 }
 
 static void ieee80211_ibss_timer(unsigned long data)
@@ -1018,7 +1018,6 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata)
 
         setup_timer(&ifibss->timer, ieee80211_ibss_timer,
                     (unsigned long) sdata);
-        mutex_init(&ifibss->mtx);
         INIT_LIST_HEAD(&ifibss->incomplete_stations);
         spin_lock_init(&ifibss->incomplete_lock);
 }
@@ -1045,8 +1044,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 {
         u32 changed = 0;
 
-        mutex_lock(&sdata->u.ibss.mtx);
-
         if (params->bssid) {
                 memcpy(sdata->u.ibss.bssid, params->bssid, ETH_ALEN);
                 sdata->u.ibss.fixed_bssid = true;
@@ -1079,8 +1076,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
         memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len);
         sdata->u.ibss.ssid_len = params->ssid_len;
 
-        mutex_unlock(&sdata->u.ibss.mtx);
-
         /*
          * 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is
          * reserved, but an HT STA shall protect HT transmissions as though
@@ -1116,8 +1111,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
         struct sta_info *sta;
         struct beacon_data *presp;
 
-        mutex_lock(&sdata->u.ibss.mtx);
-
         active_ibss = ieee80211_sta_active_ibss(sdata);
 
         if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {
@@ -1161,7 +1154,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
         /* remove beacon */
         kfree(sdata->u.ibss.ie);
         presp = rcu_dereference_protected(ifibss->presp,
-                                          lockdep_is_held(&sdata->u.ibss.mtx));
+                                          lockdep_is_held(&sdata->wdev.mtx));
         RCU_INIT_POINTER(sdata->u.ibss.presp, NULL);
         sdata->vif.bss_conf.ibss_joined = false;
         sdata->vif.bss_conf.ibss_creator = false;
@@ -1177,7 +1170,5 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
 
         del_timer_sync(&sdata->u.ibss.timer);
 
-        mutex_unlock(&sdata->u.ibss.mtx);
-
         return 0;
 }