From be0bbb201fc012e3b910c122c3eae24faba45c42 Mon Sep 17 00:00:00 2001 From: Guocai He Date: Tue, 14 Apr 2026 11:20:06 +0800 Subject: [PATCH] Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave" This reverts commit 31344ffecd7a34335ce2b52e8c205bce3cbfca4b which is commit e1696c8bd0056bc1a5f7766f58ac333adc203e8a upstream. The reverted patch introduced a deadlock. The locking situation in mainline is totally different, so it is incorrect to directly backport the commit from mainline. Signed-off-by: Guocai He Signed-off-by: Greg Kroah-Hartman --- net/wireless/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/wireless/core.c b/net/wireless/core.c index a844f5253aa4..d63480873d06 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -1300,10 +1300,8 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev, __cfg80211_leave_ocb(rdev, dev); break; case NL80211_IFTYPE_P2P_DEVICE: - cfg80211_stop_p2p_device(rdev, wdev); - break; case NL80211_IFTYPE_NAN: - cfg80211_stop_nan(rdev, wdev); + /* cannot happen, has no netdev */ break; case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_MONITOR: