From nobody Thu Mar 24 18:03:42 2022 X-Original-To: dev-commits-src-main@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 C12561A3EF77; Thu, 24 Mar 2022 18:03:43 +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 4KPY4b2vKFz3QGH; Thu, 24 Mar 2022 18:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648145023; 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=sTnEIXGbaZKZZm0Z9ab4Rd36Zs6dmQJRGSuYvr3uhJE=; b=pAL1EYaKXzjmIDjzGHPiy+/I5tWjU9Nlj0yoYD5GLc6j1uhM0otPDZeTZ9ePHX3UpCQFn5 lciLvHEpbz3dl+NrqxiHTjBM6laLqDUIkg9HPSkGUbAYYaPf2MVd8MBKIkepon9KWgsoia a1lQ4F921g/movZjs4lyZKb7FUTqD85bYomXnR7AaQMMmf7mPio78504EF2VJO7QSTBusZ UlXZgHPpOLrUcCmka2M7cRNtRxk0F5ZciAdL23c8nRsSSDnIzF4EFsRq+hyTOznD7eCTCC JgLG8m4nJ79PBCFeuSC4V8KDyUxlgXPJSwNQYZ+NtdgdC2g7Bo1ll0o27UR8fw== 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 F1E0E1C91E; Thu, 24 Mar 2022 18:03:42 +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 22OI3gLV027460; Thu, 24 Mar 2022 18:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22OI3gIE027459; Thu, 24 Mar 2022 18:03:42 GMT (envelope-from git) Date: Thu, 24 Mar 2022 18:03:42 GMT Message-Id: <202203241803.22OI3gIE027459@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: 196cfd0b2eb6 - main - LinuxKPI: 802.11: improve hw_scan fallback to sw_scan List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 196cfd0b2eb640a63d007a7e9c3a74e4256255f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648145023; 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=sTnEIXGbaZKZZm0Z9ab4Rd36Zs6dmQJRGSuYvr3uhJE=; b=yBoctl9prR0zPVRAOLXw8q94I3xPPoDvIIdXh+2+gAPZXYFQGGDmQm0YYm4oYfVGLbE/Ic yrk/pdPLAxJDztPbPbtjFwJegRves5BfYyIIAorP34olEwRn/BZ8BPzvJZwfklmianvW86 1bo588JlPK7CBXJcRgGLrNkbn3qRDYyyy7dHDb/6F5A7Qbl+IxctxviRYO4oyc7qKINMRO cRKzyzfQ+XLlp7+PUdl74TyG5OfFVfz1zygGCP07LD8v0GRRT5a2GVmnWbkYanpnoFiGOl 6xze1cBGJwG0dMYX4kfqAsSyRLXZxm5F22inEaauF5X0Alx4RNACotsUrgdf8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648145023; a=rsa-sha256; cv=none; b=m4xtsLS5eZ5Xv72gGvwQr4pO1A/0arzWmkn/KX9JkoNrerkLvGydgKyAAqFmhSOTIWcbS7 1Fj02OsUTYgzLS7XvOHwjYIJf4Kd+C8JrUXwytGcsr0RAtpM61fjlD3EgmMY9gqDfrrly7 wb/xUsK2o13o+hW9Hogcm/EK+N92Ln8V+8Elf60eYj1ZuySw1lY1NpxEgwa72Fg2koLXVp j9WyPkdVGUf3yrR/cwJTyTh644FWd5ZaKdWzzOZQ50tU3cVr5sZ0Uk1bVfkYS85Cb7+tau 2HoKhycy+pR/L7Cq+Bml5rxxthmzPD23WIm6ZmM9Pb2YMiiN0Zp4p5wuDYHIww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=196cfd0b2eb640a63d007a7e9c3a74e4256255f3 commit 196cfd0b2eb640a63d007a7e9c3a74e4256255f3 Author: Bjoern A. Zeeb AuthorDate: 2022-03-24 17:49:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-24 18:00:54 +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 MFC after: 3 days --- 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); } } }