From nobody Mon Feb 10 14:52:45 2025 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 4Ys6xp2Nybz5mGkV; Mon, 10 Feb 2025 14:52:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ys6xn4yjDz4Ldg; Mon, 10 Feb 2025 14:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199165; 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=jaM78vMRJaR5H7ngMmbCvc4fglbXunOXMiuMmqu9U9U=; b=UvqpokCm3oiY5VePaBvJ/XGhK9yGmehSeKfSbKNxT0+czhd2bAZ975bucsEnj83Et9NLoN Hh9+Mj2tc5jSFwyHNXrUm79xBIYVEUgH0S5nfTQgVtu6710JpatD7JdVbNSGirqAezWMA+ FLHPgr6kQLN8yKdYVXZPD6yS8ScFaPgp7J+ycOY5IFV8ll30P3Y0gTCPHaHNIj7VqLmmYp ercroIJHB+WiVcSUpaSWfgXifRpK12InTRgsA0AfUAYg9/c9sqDEJvSZyp70HFolHnZSk/ tK7csD+pvhHpsLAI2uNd9gSRmq0WWc5d3S9h3OWEl2mDs/sDG95ur6BUYpzBcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739199165; 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=jaM78vMRJaR5H7ngMmbCvc4fglbXunOXMiuMmqu9U9U=; b=Kz+zcobNG6d47YBAOGcB5BsVNkZbxb5b4V53zJcUGYcvDOu9a/1XMs7prLlMkUDiOXaQ/m +XdjIjOScLXiiTZh5+DBHjbWT2OCCTjbsBUyrAdVZuC8G93SF/hnlcTOOoIYiM6NFmhzhk Pia5nZ87RvyeOFounDugeG9SNDisLll8q6sWCzsQLZhdqCw+XBbQU4CIhu+pvHy85Tuml+ DURXwamgjpt39Xaz2ganJqRixqD/sIhQh+3ozhNfkKCKOsrKq4ni+JqaDsuKWjZe443DvY IZrpqMk+VS4sR9ALMfUJ73B7Q9ZxrDc0JQbm/rKonG4+8RcNVofVkzz4mSs05g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739199165; a=rsa-sha256; cv=none; b=cKHDat5IO/+KZmI1OIPvgnEZNh34TJtJEjEpzYTZzrCR1ey7hZHKee5gnER8IWAwZVgIzH A+MlhsyVA75dBtI1PSWNOEO6DmKZd9Oe12UoRpeRuiF1VYFetnnWB+dA4of+ynSPpUck+O sp2EEMmGCBxA5unUAntGXrK/q4KqMlTZLCOpIImvo7E6Gjne+phfNCfPtRfNtxfNa0twOx gnF9v9utId4vNVfDKT4nOfBBYmlHJLtpd5IAvU/8rrkg845JkLgO1tYqSVw9A44Kx1xBuI eL+VCoerQJ3IOMnGN8eLZtshPnylxkcc13KvAQsRGON2fY3GuTmTHBHJzoOj8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ys6xn11fGzWgV; Mon, 10 Feb 2025 14:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AEqjZJ028045; Mon, 10 Feb 2025 14:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AEqj8c028042; Mon, 10 Feb 2025 14:52:45 GMT (envelope-from git) Date: Mon, 10 Feb 2025 14:52:45 GMT Message-Id: <202502101452.51AEqj8c028042@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: 4d027e53be06 - stable/14 - net80211: (v)ht: use macros at hand 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 4d027e53be06ceae1a6923453fd59f596e31cf7d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4d027e53be06ceae1a6923453fd59f596e31cf7d commit 4d027e53be06ceae1a6923453fd59f596e31cf7d Author: Bjoern A. Zeeb AuthorDate: 2025-01-04 08:06:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-10 14:52:09 +0000 net80211: (v)ht: use macros at hand Rather than duplicating the manual logic here and leaving a comment, use the self-explanatory macros we already have. No functional changes intended. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48359 (cherry picked from commit 5fdc4824a5e2646a07c0638eca9f5c81b0b85fd5) --- sys/net80211/ieee80211_ht.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index e7b3afe17fdc..821c45c9f4e7 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1938,9 +1938,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags = 0; if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && - /* XXX 2 means "160MHz and 80+80MHz", 1 means "160MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, - IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) >= 1) && + IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { vhtflags = IEEE80211_CHAN_VHT160; /* Mirror the HT40 flags */ @@ -1950,9 +1948,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) vhtflags |= IEEE80211_CHAN_HT40D; } } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && - /* XXX 2 means "160MHz and 80+80MHz" */ - (_IEEE80211_MASKSHIFT(vap->iv_vht_cap.vht_cap_info, - IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && + IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info) && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { vhtflags = IEEE80211_CHAN_VHT80P80; /* Mirror the HT40 flags */