From nobody Sun Feb 20 18:15:52 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 3703619CF8EF; Sun, 20 Feb 2022 18:15:53 +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 4K1tsN5VXKz4XlL; Sun, 20 Feb 2022 18:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380952; 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=sYchp6UShjTVwFNhVYXiiH1u9Mfn7j/nbuYk5IB9sKo=; b=bI0E8VCTTyy9eimoNBbq/KkpPz2YvUofpHM/imWb3GZTiYGEv5dtfaj0AlPlQKDAL0Spc8 a3UQOxJ3NX+RBgHbBu/rm49GpcMIj8VRs4e44iiway+7dO9z8aIGttgexK4deT/KzucZLA SS7U6m5QMAoSYdE8agMXRGWBEEfaNoQqzSm9KJoszG9xTGVhpfikfjsG7jBPSDG0uz8JDm EPzu9P1nhuJl11t6akV0TDAz5QAF0s9wVJPn/vDTcravk+Tug3vpA8T8QXhsf+bYD0bB8N BNyijmqDijhCJ8TvaJHzFC/QQRTo6JiiMWQnQH+449WoWZe/Hicv4oVSMG2e6A== 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 6A4F7213DB; Sun, 20 Feb 2022 18:15:52 +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 21KIFqfk023258; Sun, 20 Feb 2022 18:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KIFq1c023257; Sun, 20 Feb 2022 18:15:52 GMT (envelope-from git) Date: Sun, 20 Feb 2022 18:15:52 GMT Message-Id: <202202201815.21KIFq1c023257@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: 266cae806264 - stable/13 - LinuxKPI: 802.11 advertise full offload scanning based on hw_scan only 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: 266cae8062643bd8e54f3dd34904fe4ff38d017a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380952; 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=sYchp6UShjTVwFNhVYXiiH1u9Mfn7j/nbuYk5IB9sKo=; b=ahz0w0ywg04vYFHMw6gvT0V2IRVgfARNQNyoTbd2AYiVtl7OZl/4S7Qs091nHFSTW/Ae1M 9JBN6ftzwDWBNJqIDy4hTHrLISBqfm63rV1zF5mcDVQG1iFbEMROhC7iDSLsUabKaOiWxy 4fT2ftO9kldDMRJvP2gJjMMRcX2GTjhH1P6IsPPLdE8TFirmaLybEsloC4u/3fR+TVYaP8 2ILPPIcq5kOFKk70HQtUjusNPIwuMH+Ts6uwb8qfUugwOnibXriXiYE8OInM50tsnVcCi/ kpL+bRIMnUrcBIIvGiEBlGP/aamUnwDZL2BQhNE7X8940jQcWvvj4h/sFGAmZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645380952; a=rsa-sha256; cv=none; b=bZDy+KV+ML+dVTeMyByUaEjDnIyBxOUN22hIcjW3Gb5uFTVoyCYO0T/xpF3+sLjoWs/ebg YUcq5y15e+yu/QjzkyQi+s8FZEuBNkehGKsVzVo9hMEN7IWodaHXlj0Ikr+jgxRGXnKB77 HfUgynlsRlHKlrqjIt+g264I+IAgmlpDfL5x6FEMS9OIhYxsTPEpXJi4SuHVTL/97eXQG8 VO3K025ZzljLU59hGsQ2yRPQrf8AETUwV26fPGM29WocCg/KRS3ifWxB/k4QlBVmkp8BGU 6nZX+54bN3Kdef325ou38ib2neX2QSyYn0QevV1y9qvL373RC5KUNE/vr2Ue6w== 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=266cae8062643bd8e54f3dd34904fe4ff38d017a commit 266cae8062643bd8e54f3dd34904fe4ff38d017a Author: Bjoern A. Zeeb AuthorDate: 2022-02-17 00:15:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-20 16:25:49 +0000 LinuxKPI: 802.11 advertise full offload scanning based on hw_scan only We disabled hw_scan for drivers not advertising SINGLE_SCAN_ON_ALL_BANDS. Do not depend on this hw flag to set IEEE80211_FEXT_SCAN_OFFLOAD for net80211 as otherwise scanning will never work. Long-term we probably want to re-think how we do/integrate hw_scan better in net80211. Sponsored by: The FreeBSD Foundation (cherry picked from commit cc4e78d51351d6362b0536e326280c1e230648d5) --- sys/compat/linuxkpi/common/src/linux_80211.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 6e5bf19d0aa1..520ecaf4f4f0 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2874,9 +2874,14 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) /* Scanning is a different kind of beast to re-work. */ ic->ic_caps |= IEEE80211_C_BGSCAN; #endif - if (lhw->ops->hw_scan && - ieee80211_hw_check(hw, SINGLE_SCAN_ON_ALL_BANDS)) { - /* Advertise full-offload scanning */ + if (lhw->ops->hw_scan) { + /* + * Advertise full-offload scanning. + * + * Not limiting to SINGLE_SCAN_ON_ALL_BANDS here as otherwise + * we essentially disable hw_scan for all drivers not setting + * the flag. + */ ic->ic_flags_ext |= IEEE80211_FEXT_SCAN_OFFLOAD; }