From nobody Fri Jul 29 15:15:13 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 4LvWKY3kjQz4XT2s; Fri, 29 Jul 2022 15:15:13 +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 4LvWKY3GBpz3MHc; Fri, 29 Jul 2022 15:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659107713; 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=aUeY1spXUub4AuKt8KsuMjoCl/M5uB2BTbhhRoiQers=; b=CUBMCGdHGoiTIpOu9w3h95YuF1zJrVKpjF13r4/bKCe+q/RK5DKhsUe2FcGNuygpo7dnPd z/TRaxxJ/q9LYYBYoGeGEAhu99yov1/VJfc1jIDKaRxCbsaDs0pROf8z+tDxQp4m4rE2Kv NV/u8bEXwG+E8wcnNTjqPeEdLECDxnXNS8mgt0PCPsWarhRz8eFNmGEsNsWDwfe/DaK+J9 Fmo4gzs38tlXdpJvGt551RrVfnh/3cMVK/hxZ1JwVNeo4s6mLt0fxRc9u8mPX2Hs4i+s1q U37GiLDM3PR49xWbWU2kOMj98u38KREzuLIU4gnnYgWNKycp5pVsZ6/HIc0zFw== 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 4LvWKY2M31zg68; Fri, 29 Jul 2022 15:15:13 +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 26TFFDqQ037660; Fri, 29 Jul 2022 15:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TFFDKu037659; Fri, 29 Jul 2022 15:15:13 GMT (envelope-from git) Date: Fri, 29 Jul 2022 15:15:13 GMT Message-Id: <202207291515.26TFFDKu037659@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: 656d0e8fa92a - main - net80211: add VHT5G and VHT2G checks/return to media_status 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: 656d0e8fa92ad72626808479d0935814425ee78d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659107713; 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=aUeY1spXUub4AuKt8KsuMjoCl/M5uB2BTbhhRoiQers=; b=CKchN7lr01b/VRgsxrMvFxAhlvvUPyHi4riPrHRI8u2p1XHr6PiN2xfupHDzZEkYuLmfLi 6ZhPQHGLYNAAj4hwacNizMN5V83TyEtUloO8jjBPZsEfdWbnPSoetQIC1Mr9B9WFnu0Jcc oR+O5AdHjDyOoqSplfMgTmQyI6a6fgbYZE5EpmGJR2KWGTSydjubQgm1VkTFHpYWLY2acx 3/nBCYvmxWqZfnSA9+9tsQY3XgIR2+ok6hyofrlCt0xdE0UAOcnA08nIjl+OPDhSz7A2Yb 9H+Q3kAC9409aTmuKoAm64MOxTvmi/89i9NpIdjrnFd/PkLpW+a59AnkOYJFjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659107713; a=rsa-sha256; cv=none; b=ajuj1Oji8HrECJ3XZU3H+CM9dMs6wCFK9u/Z1eHe+M1kj2tXQUI4BKr9pXKF+KOcyEr02b 8eTHg3je4/bJSFXbjAXA0u5JfFB0N8xivDGm6QahDt5eJUX+jpj6YzzHtFqyUa2KAd2FcS +x1kVRO6O8wdt7BnZKVmeQMYDGz/KXAN6up8jy21QOrbP7xatfsbtsQkOeVRZlNEtMqHOX xoVUQc2fY96LN+H9r8/P7wapPDSbXJZOJZT/zO+6VqwoB8Mrwe9AaD7kPcLVvBkYiw7XnS hSnoCDBI5gtdpcWjfjWKaJaeUWU0vPlYIOE5f3IVSJaSUgo2O66M+zqXiUxkow== 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=656d0e8fa92ad72626808479d0935814425ee78d commit 656d0e8fa92ad72626808479d0935814425ee78d Author: Bjoern A. Zeeb AuthorDate: 2022-07-29 00:10:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-07-29 15:10:38 +0000 net80211: add VHT5G and VHT2G checks/return to media_status Add the fields for VHT (2Ghz and 5Ghz) to report back by media_status so we actually have a chance to get the right information. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D35977 --- sys/net80211/ieee80211.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 4bed673a78b9..4af9450213ce 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -2204,7 +2204,11 @@ media_status(enum ieee80211_opmode opmode, const struct ieee80211_channel *chan) status |= IFM_IEEE80211_MBSS; break; } - if (IEEE80211_IS_CHAN_HTA(chan)) { + if (IEEE80211_IS_CHAN_VHT_5GHZ(chan)) { + status |= IFM_IEEE80211_VHT5G; + } else if (IEEE80211_IS_CHAN_VHT_2GHZ(chan)) { + status |= IFM_IEEE80211_VHT2G; + } else if (IEEE80211_IS_CHAN_HTA(chan)) { status |= IFM_IEEE80211_11NA; } else if (IEEE80211_IS_CHAN_HTG(chan)) { status |= IFM_IEEE80211_11NG;