From nobody Sat Dec 07 07:14:58 2024 X-Original-To: dev-commits-src-main@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 4Y4zsb5Swhz5gflR; Sat, 07 Dec 2024 07:14:59 +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 4Y4zsb0RrCz49MT; Sat, 7 Dec 2024 07:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733555699; 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=NOctbNRnbCuRVUEyYLfzCpX8gt0tfw7D3pB5p8iU56o=; b=iWZZlbAZH/kmsbIikOd4/4IFfSLKd8pcrcK1DSNgTrBabRlWLEvGHClPImoTFIl9SiHrGv 2VXI8u+48UHdURzzD/lihfoRmjqQ7/RX+uObXdQQ3T4ZNLYBYZW/pxLV7zT/cBPDhL4jxa h46iulSAyrt6beGBF01XhbiFBHmHmMv61u7t3FGSYSyvHmceGBQayxcjpuQc/EMg2vZQMX kGrgVDAkiLqDFxhITB49cwiQNZtT01SILSJtwkjPbdnqfA/JJ9Qm1vus6WSepWAcus6Qk6 InA8ufRdRi0pDMpHza2lTL3U7vF4I7V3ZMtpDNxLtJvpD8akUNTShTClnSQejA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733555699; 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=NOctbNRnbCuRVUEyYLfzCpX8gt0tfw7D3pB5p8iU56o=; b=bQftBGRI7JK+RweCl7Y3adMH2UvotfyupII0lSbTfUCmjTW6dt3xFBi2dI/kkNqRU90oly 7+9+faXcRU7wf7JGBuE0X85h1DsKnNC3eCeCfiEIN381Q9AN/qQ7UDre9FDwrcuuGdunzr aTMHE+KQUpS3tDziAfwDp/flkLKo9Ml8Qwyu51u6nPPNB+EjgTHFdvZIWmHwAyMdgYBsxC czaIu6wE9iyIxEMSCGhGtkrYFLmoFt38vuaU+e9WtA5bCfZQ7Kjuq6SXWolusnqEHRf63q fO6pkt5dwoq2uqCs2e5dtLy2KRq9fm1oOBtnEnDxSNihpnJh58RFAvUDLoIitg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733555699; a=rsa-sha256; cv=none; b=RAwsTemC7U632ehc/WghlGPxc7Gw3E4+JqqkV+xwzP3iMtLX7vfj/6VkEVCmsqI1MUHXWR fJAJ1HLoulxgVT+6RFby2uDBVv1nfpWuedXxpsyQFoSM+7U29QN+9Z3Xe94Laxw0OmbiwP EBkOMNIsH5SrrE6k+rKyRj2ySoZXVGXmeJe4lQrahtlxKs55OlCNS7mobCGD4ftWwb70N/ 4v1l5t7LtJDMEA3PX6K3j5jjjrU84nDFBw3U7bzdlAtPfOZemyRr2jTwQDtrhbbJybfD7i ubD77UjEPWdrLNx7Ee79EpdGoAmLB/xIyx/d7M+QUEq9ifZomE5UbhDkFkH+IQ== 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 4Y4zsb04MRz1Ckn; Sat, 7 Dec 2024 07:14:59 +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 4B77Ew1G058575; Sat, 7 Dec 2024 07:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B77Ew2C058572; Sat, 7 Dec 2024 07:14:58 GMT (envelope-from git) Date: Sat, 7 Dec 2024 07:14:58 GMT Message-Id: <202412070714.4B77Ew2C058572@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: f6f03d156ba7 - main - rtwn: add VHT awareness to rtwn_chan2centieee() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f6f03d156ba78f15612fd0b1dce935feb63b9aad Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f6f03d156ba78f15612fd0b1dce935feb63b9aad commit f6f03d156ba78f15612fd0b1dce935feb63b9aad Author: Adrian Chadd AuthorDate: 2024-12-04 05:39:22 +0000 Commit: Adrian Chadd CommitDate: 2024-12-07 07:14:20 +0000 rtwn: add VHT awareness to rtwn_chan2centieee() Since we're not doing 80+80 yet, this is easy - just use the freq1 centre. Differential Revision: https://reviews.freebsd.org/D47900 --- sys/dev/rtwn/if_rtwnreg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/rtwn/if_rtwnreg.h b/sys/dev/rtwn/if_rtwnreg.h index 9762f0482b1c..f1c0a7a6ff55 100644 --- a/sys/dev/rtwn/if_rtwnreg.h +++ b/sys/dev/rtwn/if_rtwnreg.h @@ -158,6 +158,9 @@ rtwn_chan2centieee(const struct ieee80211_channel *c) { int chan; + if (IEEE80211_IS_CHAN_VHT(c)) + return c->ic_vht_ch_freq1; + chan = c->ic_ieee; if (c->ic_extieee != 0) chan = (chan + c->ic_extieee) / 2;