From nobody Sun Mar 27 20:14:15 2022 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 196481A5444C; Sun, 27 Mar 2022 20:14:17 +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 4KRRqr3jmTz4p1D; Sun, 27 Mar 2022 20:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412056; 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=8MsrrySMseJ6etj3UqaTA2LGUJDNaNGd/emfhjhRKJQ=; b=W8JsBDn46yM7mET+9i/2/wCi4kAg8dJNwb9xeAkFRpCBp1FOS+6EjWpsUb9XG0ULjwnIbk lhtJ15G3O6/KBKK31wUloW6IhdOx2MIJlnEQyiPBLjn8368LuMxEpzHlzR/8VIZjYt162B Z/MEFyOZS9LoV7HqvN8iISXxhzZI3EgCyJL1UrFDfVUMk8nVOF14mTuiwqGkCXXy+xwIsu 5ZkUGbteNQ1awy+1TXTgU0rcjWPLgx3REu7CIXQX4grpttsTuaVWHEpXGC5zl/VWvd59u2 aypJSA6PyZOG4RPjkkKmXNNRuFvjaD54Uyi3rMywc5z7WYzWtNqp0nUoLiFiYA== 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 0DEF01B769; Sun, 27 Mar 2022 20:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22RKEF0u037473; Sun, 27 Mar 2022 20:14:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RKEFSx037472; Sun, 27 Mar 2022 20:14:15 GMT (envelope-from git) Date: Sun, 27 Mar 2022 20:14:15 GMT Message-Id: <202203272014.22RKEFSx037472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a1272e7d9621 - stable/13 - LinuxKPI: 802.11: improve hw_scan fallback to sw_scan 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a1272e7d9621f95ca53f1bdef5ed78be12cac277 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412056; 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=8MsrrySMseJ6etj3UqaTA2LGUJDNaNGd/emfhjhRKJQ=; b=Dvcq8r2td6RE5NYL6UqlpMRq4xAJSAwq4t/klZ7b2a2PTYde0qnDcVqW/r17voICHcOkis BSfK1QQ3lPChOKLrGAKcgxdsFH7yTzBLzd7Mii8Cr8QKu8bMzd+KLX+1m5WQsvg1+sF0Ki eAoleJ45HokHVSbhzsPF9c/7gR+T3AYHPn0iShglYwd57Kwfehv72mHU14kpJ15hPyQVbq r4G2vPKGZxbqnyWT5wjbfsbhwbIiHIO7vMRvfQzPdivM+cGDKwPyNnqoYwsvYNpYulKSt/ Kn2pxZdVUIqYPByLrmNXCrBNu2UZray4Ua9lmOa6GUQKPvD8na7ChjQee9kIdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648412056; a=rsa-sha256; cv=none; b=GeRvjVyq8zMb/UA8PJRwFh2HhL6gEGeFzmvi15k7GSpE8XjHKj+66ZxIUeH89ausKAPGuK +sY2A8PKPwX3+ROXjACe8a7BbAN0f4DPA6twIFBN2keZRyxP3hQPTjzjIErEEmtDO8g+Qz ZXZv+S+tCBB9/Dm2h1hZFjqLWH+m2Lkj93FbMyITgDdxIVB/28vGI/y/zLJ8NrqdkRqK9L wYAO6++Vusu/GyfeBY/dVN+lFKIFiqxV9GVISKKEnV4RhzjSVBtIgd/Zz0JjeeFx4kEpfv mNeRqsnyEBPo/eswAvaJGCJ/++r4KP+K60ITFmVmjZwXhwxbjt4RTQ/dReMa2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a1272e7d9621f95ca53f1bdef5ed78be12cac277 commit a1272e7d9621f95ca53f1bdef5ed78be12cac277 Author: Bjoern A. Zeeb AuthorDate: 2022-03-24 17:49:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-27 18:12:49 +0000 LinuxKPI: 802.11: improve hw_scan fallback to sw_scan Extending what was started in d3ef7fb459ff924911e5276db0c04b13cd8074d9, when a driver signals that hw_scan is not possible and expects a sw_scan to be preformed we triggered a sw_scan towards the driver but did not let net80211 know. Cancel the initial scan towards net80211. If we we defer to sw_scan then clear IEEE80211_FEXT_SCAN_OFFLOAD so net80211 will send probe requests, and actively start a new scan with net80211. This may have to be further refined in the future but seems to work for the moment. Sponsored by: The FreeBSD Foundation (cherry picked from commit 196cfd0b2eb640a63d007a7e9c3a74e4256255f3) --- sys/compat/linuxkpi/common/src/linux_80211.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 727c0e276af9..384d068d7920 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2547,17 +2547,27 @@ sw_scan: free(hw_req, M_LKPI80211); lhw->hw_req = NULL; + ieee80211_cancel_scan(vap); /* * XXX-SIGH magic number. * rtw88 has a magic "return 1" if offloading scan is * not possible. Fall back to sw scan in that case. */ - if (error == 1) + if (error == 1) { + vap->iv_flags_ext &= ~IEEE80211_FEXT_SCAN_OFFLOAD; + ieee80211_start_scan(vap, + IEEE80211_SCAN_ACTIVE | + IEEE80211_SCAN_NOPICK | + IEEE80211_SCAN_ONCE, + IEEE80211_SCAN_FOREVER, + ss->ss_mindwell ? ss->ss_mindwell : msecs_to_ticks(20), + ss->ss_maxdwell ? ss->ss_maxdwell : msecs_to_ticks(200), + vap->iv_des_nssid, vap->iv_des_ssid); goto sw_scan; + } ic_printf(ic, "ERROR: %s: hw_scan returned %d\n", __func__, error); - ieee80211_cancel_scan(vap); } } }