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, 5 insertions, 5 deletions

diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index f83074fe6670..cafe614ef93d 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -228,9 +228,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
         if (sdata->vif.type != NL80211_IFTYPE_STATION)
                 return -EOPNOTSUPP;
 
-        mutex_lock(&sdata->u.mgd.mtx);
+        sdata_lock(sdata);
         err = __ieee80211_request_smps(sdata, smps_mode);
-        mutex_unlock(&sdata->u.mgd.mtx);
+        sdata_unlock(sdata);
 
         return err;
 }
@@ -313,16 +313,16 @@ static ssize_t ieee80211_if_parse_tkip_mic_test(
         case NL80211_IFTYPE_STATION:
                 fc |= cpu_to_le16(IEEE80211_FCTL_TODS);
                 /* BSSID SA DA */
-                mutex_lock(&sdata->u.mgd.mtx);
+                sdata_lock(sdata);
                 if (!sdata->u.mgd.associated) {
-                        mutex_unlock(&sdata->u.mgd.mtx);
+                        sdata_unlock(sdata);
                         dev_kfree_skb(skb);
                         return -ENOTCONN;
                 }
                 memcpy(hdr->addr1, sdata->u.mgd.associated->bssid, ETH_ALEN);
                 memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN);
                 memcpy(hdr->addr3, addr, ETH_ALEN);
-                mutex_unlock(&sdata->u.mgd.mtx);
+                sdata_unlock(sdata);
                 break;
         default:
                 dev_kfree_skb(skb);