From nobody Fri Jan 03 01:24:28 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 4YPQph3RcMz5kDB1; Fri, 03 Jan 2025 01:24:28 +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 4YPQph1B85z4NrZ; Fri, 3 Jan 2025 01:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735867468; 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=+ExSc9F53JNnanl3CuQj+te0tv1u9uqUudZFFIJa1bk=; b=hj/w0Lb/1xxTTYK9U8pz55Tc1gB3qANZN9CMWG/YsECe8fzlaxe0o1fDxhhmFQGB34thZA gxL28JY03oB3PjGxQkCmM1UlmKbkbDekJP/tovYN0gXAKfLA0gf/7C6Xw9o5QBoI8aE9dS YKOgXpwOqCOZaA7EDZ2ixae4V7z/YpJT7AXbOjHN22hGdhpnxVaJyUioyyoKhf2Velj18E itSlq1MNk/7GDNNvi250BwSH25WQcblCrSGaMck6Cyul0Bw6WJWImvC2Ohwh40KU+APyRy qrAfBUdlmJzokVKW3hqoGr/BpvD5BrsMlkvHrFbobRFHSsWofrm4z6Wysi+LEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735867468; 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=+ExSc9F53JNnanl3CuQj+te0tv1u9uqUudZFFIJa1bk=; b=M/krZxAiJy6nPC5UPG66JHXy7MqoJDdnMswc4hPMAkFdD2rFvSa6NmSIJX/LJyUCaBTmKg XkdlABnxDNXv9JHiBgWlhoRWq2Sa+9zgRPGGDy60lOe2CrrHiJhgPzg9LWJcJ6wDxcrWru Qkm0mE50gooHGqnG7UGW/vfh+S980IcTul7Q2q+HicnxB39NxR+Bkj9jXChI1J1D9p4W5o KwQVBWyR2r0vs6slGA3CKfjBccl173EP7b4QxxBBtgWwmiMWURz0tRNd4/WsTl3AACp1CE iWwq4criOIMmjH4YwL5j4jnZ5LRlqUCmqwAqN8RDV8mw8cBuLYghz/k/PYK2XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735867468; a=rsa-sha256; cv=none; b=Yt1N4dKNgK0lRznLBAUQ70L6M4QUDxnr8ZbziSQmk7pyZ5qYHENdTSCzDSxpdBgZae7O3I /iG9rghkeNcwLphToB6nmXWnTjdDWq4kq54ZYf+VNqSUUjm8SVmAtA+IcmPEAWM6GIMvOG loAhk38U3Ky6CN1iGIo2oEFmjhtZtmSEDyP5XZrZD/oOW1lJl1oJHKJoilyF1bhebnA2LV /fT8C8LcEA4uzOTmZzw4wnonY+ZvDjsyYE31sGlxbKAMNQ3tl10UsarWu3SBjlx857xkYi 6HjrECgulYuBRtEhuruuJTj3w62Yru3jeKmjlqVbYWfEe2+OQZ4op5R6/g7JXQ== 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 4YPQph0bJLz11wv; Fri, 03 Jan 2025 01:24:28 +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 5031OSXv053176; Fri, 3 Jan 2025 01:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031OSiW053173; Fri, 3 Jan 2025 01:24:28 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:24:28 GMT Message-Id: <202501030124.5031OSiW053173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 2be951a526cb - main - rtwn: enable VHT if it's configured in the device 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2be951a526cb2ac20346b96173e553af6031a38c Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=2be951a526cb2ac20346b96173e553af6031a38c commit 2be951a526cb2ac20346b96173e553af6031a38c Author: Adrian Chadd AuthorDate: 2024-12-15 22:43:04 +0000 Commit: Adrian Chadd CommitDate: 2025-01-03 01:18:16 +0000 rtwn: enable VHT if it's configured in the device If the driver attach path adds the VHT flag then add the 20/40/80 MHz VHT channels. This is a no-op right now as nothing is enabling it. Differential Revision: https://reviews.freebsd.org/D48097 Reviewed by: bz --- sys/dev/rtwn/if_rtwn.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c index d7dd97a3fe18..ed84950b1a94 100644 --- a/sys/dev/rtwn/if_rtwn.c +++ b/sys/dev/rtwn/if_rtwn.c @@ -1621,6 +1621,14 @@ rtwn_getradiocaps(struct ieee80211com *ic, /* XXX workaround add_channel_list() limitations */ setbit(bands, IEEE80211_MODE_11A); setbit(bands, IEEE80211_MODE_11NA); + + if (IEEE80211_CONF_VHT(ic)) { + setbit(bands, IEEE80211_MODE_VHT_5GHZ); + /* Only enable VHT80 if HT40/VHT40 is available */ + if (sc->sc_ht40) + cbw_flags |= NET80211_CBW_FLAG_VHT80; + } + for (i = 0; i < nitems(sc->chan_num_5ghz); i++) { if (sc->chan_num_5ghz[i] == 0) continue;