From nobody Wed Nov 12 18:46:32 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d6C6d0YwVz6GR7Z; Wed, 12 Nov 2025 18:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6C6c4wZFz3g6J; Wed, 12 Nov 2025 18:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKb8aliKx7OO/4nRGf25exPVSCDesTNRHThmjhtv6Oc=; b=i6nI1mcnro+y40Bu2uo36Lh708+2ur0URApPVcIgk1rV3sJSmPIJ7aIlPsYyqRw1obNIJt 37tiC313GxEiCTQeFZHxZSAcU1Gj1+QCc6jwQ12/75zoZM+bjnIIfNtl81eUtMrjgranPr A/v/1KUylJzvQC03UgEjOe5UfuRciA8h7JAxuX8eQjjPq1nrDjSDEuPD6jxgsMLF3gLCXY j5sLS0XZroNV6qIb7v/Jnll+LPdRdyIhVeU/dK2KKdAb+LA3ThaLWFdDmuBZaOK27HMRb4 kS/eGW1YQs6dBUBqY/olBubiAUMl3713HWW7+EvGedP3Y3ehppYYQf+efs0e+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762973192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JKb8aliKx7OO/4nRGf25exPVSCDesTNRHThmjhtv6Oc=; b=V/5YVtuX6Mhr0aFKI9gUA64fc38a/1feRC8aJE+6Pk2eWmhp1lkwqsyfzSIoIbLMpt9Uyg 7uXomgtxmo91q5yrN3xJKfXo4VQaRUrhCozGwUsSiEgBCXwcbqwRWSTWHOGo8yssywj2yd oS5GdGggGg1QDFj2eWxheXcipG2wcf/j57RB4dox+pv/ghY0S+LBbT1eZsj7PWboZRETIA TMbk3V3pgTEq812EXheD11Aa9IE1gCyneWzbn8YF1fWmnYq1tnjKqEe4k8aK5U6523ZDkA qPxFqT5s1QxIk77mGzdHKAoh6SR74NkiREGTCpywRPt5CUvbja0mmMHXDotiCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762973192; a=rsa-sha256; cv=none; b=R7NVhyLpz/IA4nGsMYSHbrQYztbIiRomSR/J6U6jDWyK7fzvMOTIXNseRJgRMnHuft/UA1 Sb2WfFe/pPwZGQxEg7USQKSFIkbCJ/H/WMVR09rPCb3TjHl/h7/3N5JnilcCAlZAvbWiuK K/qgaxbB/nia8288dFBzUPgmu+K6WIcx18SKs7oePpb33bpMi1E9PzHv1cNfplviRiso87 MelJcj1tG9Zy8XF6aEUOKSOzoi826Ej9AOUXN9fI8am8s4TKN2ti4ih6XqGN88utbnNL75 m/kp++GDAVMtJSyVTfBzSL9chz422V/YTYDOpbhdS7gtwj2L+779/DMCUA31Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d6C6c46sxzmhw; Wed, 12 Nov 2025 18:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ACIkWoS097888; Wed, 12 Nov 2025 18:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ACIkWCl097885; Wed, 12 Nov 2025 18:46:32 GMT (envelope-from git) Date: Wed, 12 Nov 2025 18:46:32 GMT Message-Id: <202511121846.5ACIkWCl097885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f490eae83f7f - releng/15.0 - LinuxKPI: 802.11: clear CONF_IDLE earlier List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f490eae83f7f90de8be5d1dea593227dbfb98f36 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f490eae83f7f90de8be5d1dea593227dbfb98f36 commit f490eae83f7f90de8be5d1dea593227dbfb98f36 Author: Bjoern A. Zeeb AuthorDate: 2025-11-10 19:41:08 +0000 Commit: Colin Percival CommitDate: 2025-11-12 18:46:14 +0000 LinuxKPI: 802.11: clear CONF_IDLE earlier When starting to scan and ending a scan we clear/set the hardware to idle. Similarly we set the hw to idle when we remove the channel context but when starting we only set it to non-idle when we went from assoc to run. This apparently was not a problem most of the time as the switch from a failed hardware scan to a software scan was racing against net80211. ad4ddc83ebf8 fixed that specifically for rtw88 and while we were more consistently scanning, this broke authentication as the setting of idle at the end of the scan was now happening reliably. Move the unsetting of idle from assoc_to_run to scan_to_auth for when we create the chanctx to keep it symmetrical. This makes authentication work again for rtw88 (though not for everyone due to other possible problems with net80211). This likely also fixes the problems in the listed PRs. iwlwifi(4) mvm and mld driver parts do not use this information at all and were never affected. Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation PR: 290850, 288186, 281979 PR: 272145 (the non skb-mem-limit parts) (cherry picked from commit b568711f8ef1afd7c86ea2d8bd2f94f399f54dc1) (cherry picked from commit a77abd53e83c4357ad8a8006a6e89759e65e3a5b) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0dc3b2631804..f025f191a3bd 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2308,6 +2308,10 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int changed |= IEEE80211_CHANCTX_CHANGE_WIDTH; lkpi_80211_mo_change_chanctx(hw, chanctx_conf, changed); } else { + /* The device is no longer idle. */ + IMPROVE("Once we do multi-vif, only do for 1st chanctx"); + lkpi_hw_conf_idle(hw, false); + error = lkpi_80211_mo_add_chanctx(hw, chanctx_conf); if (error == 0 || error == EOPNOTSUPP) { vif->bss_conf.chanreq.oper.chan = chanctx_conf->def.chan; @@ -3081,8 +3085,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->in_mgd = false; } - lkpi_hw_conf_idle(hw, false); - /* * And then: * - (more packets)?