From nobody Thu Sep 21 17:38:21 2023 X-Original-To: dev-commits-src-all@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 4Rs2gL1FMTz4tlBk; Thu, 21 Sep 2023 17:38:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2gL0kbHz3Fpd; Thu, 21 Sep 2023 17:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695317902; 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=6bbZ9CYnpxcYV9LSjlGhUxF8NuwL2j8SxsoUqQudUL0=; b=xGLhGaXJ1MRZgonnn3bBXtNnwTZENZ0Sc8G9XXG1j4ccYpSUdkzTHM1EnAAEBXFUcUgs6b a63xG24Gj2UrII+lM429lXZFeHBiZzoC0YMDtOwswbBiz+VZ7Zm45f7v1cbFPHVEEi1Ary 6/TlIIKNB1QgjwKiQhS2x67tchwrXvPQEozL/LF0ioxuEiTtMdj1VQwoL998CQNhiv2mLL ZOC36FH8A3r46Cfa30+Y2a3QaX9t0+eBLVlzV+MW4nV33WUHbKTzzZbJxHhmzXV9A7Uvgl F/cTRPatJvYdBBrELI3WmIa4YBL3MgxvnqgYekvqLhs/BabjcIzbuXBgQifw3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695317902; a=rsa-sha256; cv=none; b=BedRGFXSa0N6CQ1nozWvAnsq9iaQzRXPkCqji4XsdiXTKNbQkCqOhNzUEF2tlGVUv/aWam jdO/Y4ptViq5tLxPTwNTYl20+BW+I9Mn6LK9D0oNJDYN+BVz+ig8pv1OqnFvSv+rYcmHeq vuzpykrss/OsuTZdb8fE17uQjJMGEixjHJuZHTBPFCmlaR5M1Em9AjVDHFCIuWs5WVTEZz 5wH/XPBUlYnqkkSw5tjYB4ESKlPr5iXeEmLOXW7qjFfzwHdrCxn3cGSDN4n3d/3b7uGCmg yGfWsXWjsJL7iSMF6UWt4/INfuNAASgu+fDWI2EwMp4dseDUw/2b5uEhcAB9nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695317902; 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=6bbZ9CYnpxcYV9LSjlGhUxF8NuwL2j8SxsoUqQudUL0=; b=tpGUjoqlmCZlnyA3OlZTjOE+YS8lrQ7ZVrE1ykbk5i923MJW10povfq4mPUYVcPd4xK+x1 GU++ix8U52cwIWyPea+jx/jIqjQwU2oq44cXq9Acodldb6vH4E8svdoqgiH0u/MG14Kiu8 mDO1B+H66/rA5cn2kDbRnKac7q+mCmb1sN8b1cpZ7uDOBC16t2hIrfKN4wG71SCx2jEUyA 2x7ko9TaOsv74f3LPnP35HvmFGR/u98xxFiTetXlaoq/Now17j4BYrxF4DrkRhWs7uHnRN b/Ybhxh7lvLPBDTa9WNz/UYxs76NKHJbC06J05uAqHVuV3jgrgahP344pLU5hw== 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 4Rs2gK6vc7znXn; Thu, 21 Sep 2023 17:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHcL0Q009278; Thu, 21 Sep 2023 17:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHcLYA009275; Thu, 21 Sep 2023 17:38:21 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:38:21 GMT Message-Id: <202309211738.38LHcLYA009275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3f382eb23b9f - main - net80211: introduce two extra ieee80211_notify_scan_done() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f382eb23b9fee75d05276a44feb5351d956238e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f382eb23b9fee75d05276a44feb5351d956238e commit 3f382eb23b9fee75d05276a44feb5351d956238e Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:37:55 +0000 net80211: introduce two extra ieee80211_notify_scan_done() We have multiple problems with scanning currently, one being that an initial scan restarts itself and we are unable to start another scan. wpa_supplicant in that case never shows scan results. Starting wpa_cli you may see: <3>CTRL-EVENT-SCAN-FAILED ret=-1 retry=1 messages. Add two extra calls to ieee80211_notify_scan_done() at the end of scans (before possible restarts). That will get wpa_supplicant to get scan results and possibly start associating to a BSSID and get us out of scan. This is kind-of a bandaid but on short notice may help to improve the situation for some. Based on analysis by: enweiwu Submitted by: enweiwu (initial version) Sponsored by: The FreeBSD Foundation MFC after: 3 days Tested by: cy, (others I cannot find email/PR for anymore) Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D38661 --- sys/net80211/ieee80211_scan_sw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index 0aaa80a6c48d..62f6bf24d42a 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -388,9 +388,10 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, * scan_start method to populate it. */ ss->ss_next = 0; - if (ss->ss_last != 0) + if (ss->ss_last != 0) { + ieee80211_notify_scan_done(vap); ss->ss_ops->scan_restart(ss, vap); - else { + } else { ss->ss_ops->scan_start(ss, vap); #ifdef IEEE80211_DEBUG if (ieee80211_msg_scan(vap)) @@ -857,6 +858,7 @@ scan_end(struct ieee80211_scan_state *ss, int scandone) else vap->iv_stats.is_scan_passive++; + ieee80211_notify_scan_done(vap); ss->ss_ops->scan_restart(ss, vap); /* XXX? */ ieee80211_runtask(ic, &ss_priv->ss_scan_start); IEEE80211_UNLOCK(ic);