diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-08 21:45:15 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:02:15 +0200 |
| commit | 5fe231e873729fa2f57cdc417d5c1f80871e2d7d (patch) | |
| tree | 48810991fa4cf4faa69c0a992fdaf962feb6edda /net/wireless/mesh.c | |
| parent | 73810b77def898b43a97638478692922b7f820eb (diff) | |
| download | linux-5fe231e873729fa2f57cdc417d5c1f80871e2d7d.tar.bz2 | |
cfg80211: vastly simplify locking
Virtually all code paths in cfg80211 already (need to) hold
the RTNL. As such, there's little point in having another
four mutexes for various parts of the code, they just cause
lock ordering issues (and much of the time, the RTNL and a
few of the others need thus be held.)
Simplify all this by getting rid of the extra four mutexes
and just use the RTNL throughout. Only a few code changes
were needed to do this and we can get rid of a work struct
for bonus points.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/mesh.c')
| -rw-r--r-- | net/wireless/mesh.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index 9546ad210550..5dfb289ab761 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -186,11 +186,9 @@ int cfg80211_join_mesh(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - mutex_lock(&rdev->devlist_mtx); wdev_lock(wdev); err = __cfg80211_join_mesh(rdev, dev, setup, conf); wdev_unlock(wdev); - mutex_unlock(&rdev->devlist_mtx); return err; } |