diff options
| author | Markus Theil <markus.theil@tu-ilmenau.de> | 2020-01-08 12:55:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-23 08:21:33 +0100 |
| commit | 5205825195a1af8d98ef2d2e3eb083f2f1bb4724 (patch) | |
| tree | 9e16dd1f20c3b35701a635f0932db06922cd88b6 | |
| parent | 042a3a6d938481da53f04299bbfd43401c42d41b (diff) | |
| download | linux-stable-5205825195a1af8d98ef2d2e3eb083f2f1bb4724.tar.gz linux-stable-5205825195a1af8d98ef2d2e3eb083f2f1bb4724.tar.bz2 linux-stable-5205825195a1af8d98ef2d2e3eb083f2f1bb4724.zip | |
cfg80211: fix deadlocks in autodisconnect work
commit 5a128a088a2ab0b5190eeb232b5aa0b1017a0317 upstream.
Use methods which do not try to acquire the wdev lock themselves.
Cc: stable@vger.kernel.org
Fixes: 37b1c004685a3 ("cfg80211: Support all iftypes in autodisconnect_wk")
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
Link: https://lore.kernel.org/r/20200108115536.2262-1-markus.theil@tu-ilmenau.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/wireless/sme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 07c2196e9d57..f455b9af6815 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -1281,14 +1281,14 @@ void cfg80211_autodisconnect_wk(struct work_struct *work) if (wdev->conn_owner_nlportid) { switch (wdev->iftype) { case NL80211_IFTYPE_ADHOC: - cfg80211_leave_ibss(rdev, wdev->netdev, false); + __cfg80211_leave_ibss(rdev, wdev->netdev, false); break; case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: - cfg80211_stop_ap(rdev, wdev->netdev, false); + __cfg80211_stop_ap(rdev, wdev->netdev, false); break; case NL80211_IFTYPE_MESH_POINT: - cfg80211_leave_mesh(rdev, wdev->netdev); + __cfg80211_leave_mesh(rdev, wdev->netdev); break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: |