From: <gregkh@linuxfoundation.org>
To: gregkh@linuxfoundation.org,guocai.he.cn@windriver.com,johannes.berg@intel.com,miriam.rachel.korenblit@intel.com,regressions@lists.linux.dev
Cc: <stable-commits@vger.kernel.org>
Subject: Patch "Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave"" has been added to the 6.6-stable tree
Date: Thu, 23 Apr 2026 13:23:00 +0200 [thread overview]
Message-ID: <2026042300-bubble-shaky-0655@gregkh> (raw)
In-Reply-To: <20260414024634.2826229-1-guocai.he.cn@windriver.com>
This is a note to let you know that I've just added the patch titled
Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave"
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-wifi-cfg80211-stop-nan-and-p2p-in-cfg80211_leave.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From stable+bounces-237706-greg=kroah.com@vger.kernel.org Tue Apr 14 04:47:26 2026
From: guocai.he.cn@windriver.com
Date: Tue, 14 Apr 2026 10:46:34 +0800
Subject: Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave"
To: gregkh@linuxfoundation.org
Cc: stable@vger.kernel.org, johannes.berg@intel.com, netdev@vger.kernel.org, regressions@lists.linux.dev, miriam.rachel.korenblit@intel.com, linux-kernel@vger.kernel.org
Message-ID: <20260414024634.2826229-1-guocai.he.cn@windriver.com>
From: Guocai He <guocai.he.cn@windriver.com>
This reverts commit 4d7a05da767e5cbcf4db511b9289d7ebd380dc56 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 <guocai.he.cn@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/wireless/core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1332,10 +1332,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:
Patches currently in stable-queue which might be from guocai.he.cn@windriver.com are
queue-6.6/revert-wifi-cfg80211-stop-nan-and-p2p-in-cfg80211_leave.patch
prev parent reply other threads:[~2026-04-23 11:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-14 2:46 [PATCH 6.6.y] Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave" guocai.he.cn
2026-04-23 11:23 ` gregkh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2026042300-bubble-shaky-0655@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=guocai.he.cn@windriver.com \
--cc=johannes.berg@intel.com \
--cc=miriam.rachel.korenblit@intel.com \
--cc=regressions@lists.linux.dev \
--cc=stable-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.