Hi Bill,

On Mon, May 04, 2026 at 02:13:28PM +0200, Bill Allombert wrote:
> On Mon, May 04, 2026 at 02:06:59PM +0200, Salvatore Bonaccorso wrote:
> > Hi Brad,
> > 
> > [I will now drop the CC to the bug from Bill, as we do not know yet if
> > it is the same issue, Bill if you can test and this fixes the same for
> > you we can merge the two, otherwise bisecting your issue would be
> > helpful as well]
> 
> If you have a kernel package somewhere, I can test it.
> 
> Otherwise, I will need some times just to clone the repo...

I do not have one at hand. But it should be actually bit easier with
the following specific proceudre to test patches:

https://kernel-team.pages.debian.net/kernel-handbook/ch-common-tasks.html#id-1.6.6.4

So once you have the 6.1.170-1 source unpackged and the requisites
fullfilled, with the attached patch, just run our test-patches script
to build a deb for you.

Attached is the revert commit picked from the current stable-queue.

Hope this helps, let me know if you encounter issues with it.

Regards,
Salvatore
>From [email protected] Tue Apr 14 04:17:08 2026
From: [email protected]
Date: Tue, 14 Apr 2026 10:16:33 +0800
Subject: Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave"
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected], [email protected]
Message-ID: <[email protected]>

From: Guocai He <[email protected]>

This reverts commit 0c4f1c02d27a880b10b58c63f574f13bed4f711d 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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 net/wireless/core.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1328,10 +1328,8 @@ void __cfg80211_leave(struct cfg80211_re
 		__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:

Reply via email to