aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2025-01-04 08:06:58 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2025-01-07 18:17:35 +0000
commit5fdc4824a5e2646a07c0638eca9f5c81b0b85fd5 (patch)
treeed28b447357be02ded4afe55847c0233e26fff66
parenta3a308f0f29b14d522c56dd88231e27fdf206104 (diff)
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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48359
-rw-r--r--sys/net80211/ieee80211_ht.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
index e2506c1e0ce0..2ec5ffb1a2af 100644
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -1934,9 +1934,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 */
@@ -1946,9 +1944,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 */