From nobody Wed Feb 26 15:03:09 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 4Z2yQQ2WJwz5qG2f; Wed, 26 Feb 2025 15:03:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2yQQ0skFz3GF2; Wed, 26 Feb 2025 15:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582190; 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=PBMyq2sTWsF/a28VQH1td4zWBI7vavMl5eSsL+LjeBE=; b=Kcet7pfFAALMyTYQGVeAk/C/aNd7Km6Z7Mxt6xhsaGef8mUH87Y80VSJT66kwbskkNoeFk MVZ3NTDzwIX9PXICR1hppecnNU6p716xi3gZ76lGn44+MEQhVdzFcgB61C3sGV2OQTkL4/ Z2ZsVBICZJ7QnH8GY2RfCtA6rPc7I5uC6WIAwz7LFeeeLqselLTuShFKymb8MYzHIfLXY4 fpqyy0oVv4ZkK5rHPOZ03TmYe/0mGcWhj1HLsYUkhM4I468jEkohh1CJjHFGSvN/Pch4Tw Vx+KFuKil1OcH+U6qdoIZDCKAtLDAYd2wuTLnOcAUlrlnn/Lc3dMYyKNxMOgEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582190; a=rsa-sha256; cv=none; b=BjGprCL8KeW0bsM4AGNUJ/EgKkWyWW/zWbWUJiNNk0jpDtlsp/QA2CTl6Uc6MCA8tSeSm5 DOXhZ5jhIDbINTzOt/8TyYP+0hgP8Zw7MpaCNScSORn6/JfULIInzPE8lLOofVupV9q4dp 10mj/J4BcAqEX2EQIBZkas8FRkvl02s86XvVxGFD0ENvGm30BIYxcQx7JDZ1QPSa2u+ahG mM0eMXZkHT4Dj+ChQ/OqH6gajzCHVEzliECit6mTt8gjRRsP1S5Z5zTvxoKTjYLPxYDufr K3boeenVPgS+EDMCEBKjY2ibqYjJNdr61R0tWvhDzimJt6KsCsckt/JVZ5lO3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582190; 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=PBMyq2sTWsF/a28VQH1td4zWBI7vavMl5eSsL+LjeBE=; b=bqPY/7Okm1vAvupJ0jMmbpx1LovfM5qnYZvvFEuUYslULKKYxK8utWFMxlvIPS8Xo/6pn3 ATSuj0U/KkOj9tpAa0vtOEM9+33uBAT4aCDBgwAFwepTjn0JuGC3izNTbrPIwNl0tLuSaj teJyLXpDNW6opZtuWsosuWG7+w1OEfYnCfuzh0MTTrIKU0mJeC3XLMSAWJ9gSWlSCJAH31 WPqHkf0KVf9k/mG3Fb3dZMXyVcI1+D7w5wKl+KbESIWAfqdquhl9CrbRGXnUzL6Lc1TYQe fKYkzfV0SAxxUJygCTa7UbgGCXB1loAydX6fOu4YJMpZKpXtDRQfUZRRaGyV6A== 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 4Z2yQQ0SDfz1Glj; Wed, 26 Feb 2025 15:03:10 +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 51QF39VR014487; Wed, 26 Feb 2025 15:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QF39Tb014484; Wed, 26 Feb 2025 15:03:09 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:03:09 GMT Message-Id: <202502261503.51QF39Tb014484@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: 8a7430903fad - stable/14 - LinuxKPI: 802.11: use net80211 macro instead of manual check 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: 8a7430903fadc526147aeee70e6b30eb13d01ee6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7430903fadc526147aeee70e6b30eb13d01ee6 commit 8a7430903fadc526147aeee70e6b30eb13d01ee6 Author: Bjoern A. Zeeb AuthorDate: 2024-12-30 06:35:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-26 02:39:18 +0000 LinuxKPI: 802.11: use net80211 macro instead of manual check Use IEEE80211_CONF_VHT() instead of manually checking if hardware supports VHT. Sponsored by: The FreeBSD Foundation (cherry picked from commit 1f73e0ed539d2be48fed70b09e87ecccce4ca869) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index cc6b72dbea59..455b86284a7a 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5630,7 +5630,7 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) lhw->scan_ie_len += sizeof(struct ieee80211_ie_htcap); #endif #if defined(LKPI_80211_VHT) - if ((ic->ic_flags_ext & IEEE80211_FEXT_VHT) != 0) + if (IEEE80211_CONF_VHT(ic)) lhw->scan_ie_len += 2 + sizeof(struct ieee80211_vht_cap); #endif