diff options
| author |   Markus Theil <markus.theil@tu-ilmenau.de> | 2020-01-08 12:55:36 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2020-01-15 09:52:49 +0100 |
| commit | 5a128a088a2ab0b5190eeb232b5aa0b1017a0317 (patch) | |
| tree | 9e9be113fb0992ead6878b168a5ff1d28c26d9a4 | |
| parent | wireless: wext: avoid gcc -O3 warning (diff) | |
| download | linux-dev-5a128a088a2ab0b5190eeb232b5aa0b1017a0317.tar.xz linux-dev-5a128a088a2ab0b5190eeb232b5aa0b1017a0317.zip | |
cfg80211: fix deadlocks in autodisconnect work
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>
| -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 7a6c38ddc65a..d32a2ec4d96a 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -1307,14 +1307,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: |