From nobody Wed Sep 21 14:01:13 2022 X-Original-To: dev-commits-src-branches@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 4MXg7F55xBz4cY6h; Wed, 21 Sep 2022 14:01: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 4MXg7F4Cglz481g; Wed, 21 Sep 2022 14:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768873; 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=g7ve6REFDs6nKxIpKFClsq/N9uE1DwWXyWMRWRLySi8=; b=XUJG+4bdYvTRoOQaZbhjRKZqbWgZMvb+Ri8hXLDftlPoaSOr4qK/bLMnaX14Rv3LLKABvn tZp+U0L1KlxingDKPpaf24fVcPcVs4dvG2Brx/pbHFzLJ2yo6b9X11PAK9oGaBcVx5N2Bg JB7Hl+a/TA+luOFT6+BpcwagEyAxMoXy0K+Lbd7TZYKb2p83UXPB67FVZLFvNS14fJcnDI ghRXAJMe4XZdSlLLjFw6DU0Qt9kxFDWp4yNErkm78FOf6HE9iUHL00pjAkjmSiPz4hOROB f7zCtPI3piP9D3ZFrt2LssDXe+pq8t39P+giJFV4L4tIknqicrhZGC73yTo9Rg== 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 4MXg7F2s9cz153K; Wed, 21 Sep 2022 14:01: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 28LE1D1Y099756; Wed, 21 Sep 2022 14:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LE1Dov099755; Wed, 21 Sep 2022 14:01:13 GMT (envelope-from git) Date: Wed, 21 Sep 2022 14:01:13 GMT Message-Id: <202209211401.28LE1Dov099755@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: 72ad2445324c - stable/13 - net80211: add VHT5G and VHT2G checks/return to media_status List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 72ad2445324c18a6f87057c5f089f4c5ad591f25 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768873; 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=g7ve6REFDs6nKxIpKFClsq/N9uE1DwWXyWMRWRLySi8=; b=UtyOQCL3cyByzKtumII5gkSguHfct5l9Lr46hJU3CrJCnRBVpvjID3/DH/0v/0ozzxtguH uCnWSA8Q68e8vhZdT7VY0rZUlGTz/g6BQ40YauQSzxwiPxjN0fTFes1hZq43d1+1e73Vw7 HbsSe+WVzMAXsgtQ+9R/VgWpZDIvGKkV/Obn1VjY6eUYfxIsVwNg7OZs9UOXkXxkEUcewg u9BXZR8hlYGrYVemQtIKkwzBF2gqfxvTnJ7doFLqPxnFQUV3rDL/KVF7LVKQZ+TLbidtUs wdtLXObsUyEUm7FHsRy8pvAZmCdABRbQIJaKlaKnYM46fmyc+Ib+pxM818Gv6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663768873; a=rsa-sha256; cv=none; b=n1JbDpTBk+h/50jP0dIDxCkPmTC5HP9+U3OcrZyxYl5AgTPHbwaxR6SYlbrFlBjn6gzDqi x8XhD0NdeYxYxwg4qPp+BjH3ZhWMDPcm2v+FYrdbXk9TINkP53sl+9LLBpsAcm+qezSMCS azpX7da7i0keL4sELw8OrKygtLLIVPBsygegn/e4v/sFlVhS4dx2itYXUc9aG/LfX3Pkkf DlnM4uInTeeKyLbtqLq6f+VclECXmw42pygwmmKc5tEjjpsWZvvl2JTjO4tqa/ZXpwra3I Pl4lYLM4CNzrWvsrgIyOrrEAMi5vHyTn0r9D2WQqzyVsifIV0/C1TbVz8/+8mQ== 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=72ad2445324c18a6f87057c5f089f4c5ad591f25 commit 72ad2445324c18a6f87057c5f089f4c5ad591f25 Author: Bjoern A. Zeeb AuthorDate: 2022-07-29 00:10:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-21 11:40:08 +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 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D35977 (cherry picked from commit 656d0e8fa92ad72626808479d0935814425ee78d) --- 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 86236d7be973..c2e868d811dd 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;