From nobody Sat Dec 07 00:23:09 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 4Y4pkQ0knyz5g8Xx; Sat, 07 Dec 2024 00:23: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 4Y4pkP4dqkz4P1L; Sat, 7 Dec 2024 00:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733530989; 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=E9WPqNPdjtB7eN1sPz5NvFedQcmuu0L0W0YEkpb5oks=; b=K0IwL/ERnByLkUb9SAIWw/aOwvITf77ePOlmhzpE/UEtiFr7JF95qkXVq1ruvZ7CZ95KOI HQ6Hf03vArBg6NHool9/W6d4X3+zZWv8u6n4LeF0vcDQNGenOq4OS8lDSOWaox3KMiqB1i m9g98TYc4fUmVLjYS2kDo+zzSxiS48HS/pWtVNbenAwJKBuNQK6fSgZcy7cZfsfuTNtlpz iQJEGNZU5nW5wepP9Dd7Y2N2TBUXCxUMIdSAFm1O6KHyBHCuXU3xwHP6UMYA4tr1SvIkLx Auk/0Q1Is8EyUl6PmbnC33LSFiNK9ENV7cB9JRxLBh61krjIvMG5vve0Yi2Hbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733530989; 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=E9WPqNPdjtB7eN1sPz5NvFedQcmuu0L0W0YEkpb5oks=; b=O/sOTV7hn2HutREmqL/upq0VWnHZoSSN/JB8iUOWvpX4NAxBelDthncKZt+OQzur8Iv71V tHQbTyIHxGL7oLR4kPakTcWniqXVUg1dEqeBjj6MdKEhXu583GnsSioFpdkY9pQtZHF3oM oSFxhmICiZVZzTjH/2eJfPqtdToBgvpZjPAahRklg2iHu0bMGyxTNY4/z5rA75uYEUVOnK y5bsi2CJPrAv9oCMvIMfPCN7i6WQlasNq5/pWMOhb0aMNNNvzRFxJw7jciwtK71E1QxH4D mzmMTi6/+EIFI43ugFS7S9m3Ekex6s4wfG96t86e+SMQbUyTAX00tAoFFbGM7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733530989; a=rsa-sha256; cv=none; b=G8k0/kEZfGrSsDUN8jedme06MiymTZYnIs4EjRDjhJ9RzyyFG5cUYlPdTI8FQAC0lUn/u2 QGD1zUU5n5uJuzaCMXd1bpLWqiDJ8WALaiZFnxtgDv7pnZhyF7YmlACe6AHxvQHCcBiyIE i0yY37eA+vw2DU/YFi9sIZjliE+CoTXYLMYmOKoSLQjjeiwbOmMfP45PNF0pLec4KahS9F kVqllHZ5ZrVs0bnDwcvXi0/UcMtmXjCBehF5TpANvnxzovWxflck9rt+wybPKZdgvbpDsP 4075m71pT78HrLltUjHEkRNJ0wFijXjmNvhMlqI9vJzptKDGnZpnbFDphYyKUw== 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 4Y4pkP4Dvfz10vw; Sat, 7 Dec 2024 00:23:09 +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 4B70N9ii094270; Sat, 7 Dec 2024 00:23:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B70N9gd094267; Sat, 7 Dec 2024 00:23:09 GMT (envelope-from git) Date: Sat, 7 Dec 2024 00:23:09 GMT Message-Id: <202412070023.4B70N9gd094267@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: b2b6c2236b9c - main - rtwn: enable HT40 for RTL8821/RTL8812 series NICs 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: b2b6c2236b9cdd6d7946aee0132a5b7dd14f285c Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=b2b6c2236b9cdd6d7946aee0132a5b7dd14f285c commit b2b6c2236b9cdd6d7946aee0132a5b7dd14f285c Author: Adrian Chadd AuthorDate: 2024-12-03 06:26:43 +0000 Commit: Adrian Chadd CommitDate: 2024-12-07 00:22:39 +0000 rtwn: enable HT40 for RTL8821/RTL8812 series NICs HT40 works fine in 2GHz and 5GHz modes in both 1 and 2 stream scenarios, so just enable it here. Differential Revision: https://reviews.freebsd.org/D47874 --- sys/dev/rtwn/rtl8812a/usb/r12au_attach.c | 7 +++++++ sys/dev/rtwn/rtl8821a/usb/r21au_attach.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c b/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c index 52a8e3d7ccf5..0c04c2d24b7b 100644 --- a/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c +++ b/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c @@ -173,6 +173,11 @@ r12au_adj_devcaps(struct rtwn_softc *sc) IEEE80211_HTC_TXLDPC; } + ic->ic_htcaps |= + IEEE80211_HTCAP_CHWIDTH40 /* 40 MHz channel width */ + | IEEE80211_HTCAP_SHORTGI40 /* short GI in 40MHz */ + ; + /* TODO: STBC, VHT etc */ } @@ -291,5 +296,7 @@ r12au_attach(struct rtwn_usb_softc *uc) sc->ntxchains = 2; sc->nrxchains = 2; + sc->sc_ht40 = 1; + r12a_attach_private(sc); } diff --git a/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c b/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c index 480b1ae36b11..9b648c067c2f 100644 --- a/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c +++ b/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c @@ -158,6 +158,11 @@ r21au_adj_devcaps(struct rtwn_softc *sc) if (rs->rs_radar != 0) ic->ic_caps |= IEEE80211_C_DFS; + ic->ic_htcaps |= + IEEE80211_HTCAP_CHWIDTH40 /* 40 MHz channel width */ + | IEEE80211_HTCAP_SHORTGI40 /* short GI in 40MHz */ + ; + /* TODO: VHT */ } @@ -277,5 +282,7 @@ r21au_attach(struct rtwn_usb_softc *uc) sc->ntxchains = 1; sc->nrxchains = 1; + sc->sc_ht40 = 1; + r21a_attach_private(sc); }