From nobody Wed Feb 26 19:31:40 2025 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 4Z34NF2XLSz5nl5G; Wed, 26 Feb 2025 19:31:41 +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 4Z34ND4GxLz3d5L; Wed, 26 Feb 2025 19:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740598300; 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=L6GBab9aJ98IHHUGTi1HejEdNJvQOjpaPxKpm6b+sk0=; b=cRcrAZNOSCxOrwPlRzlZYoyOYjKnjQOyCpWo/0VUzg5V/Sa6DtPpd2b3TVW686StX3WKV+ A2bBLCgDdA6gSSUyqOn0THFF52RBZeVr3XmlixmzxU/Fsb2Wa57jiTY4trUlnHLKmY6yxV 0D0Z5wgeWDUO9FEXlsv9p7Cv0XYrRa2yTT8CogY9FYSJgY4DN0rMQIK76deNzBZNGhPPav ++Rvfz4kf20Y1/YcWxnxIksU9SFwAfVKP2rwRrFzzEpVTDxRpd+5vxSE6HHzkrNG7CXVvI I9XRY6ZwdOty/VyqZ3dTDPfLJbFBjLgHxxfAFTJCV+nrMz6Aahm8rP0Jk/VUAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740598300; a=rsa-sha256; cv=none; b=vtPDjDbIveN5HOkypapd/7UoUlEpSzjDTAHjmjLekuL1aTliVmiUMHzM+2ygHWnsu+CGQI wmZj1hPHtbWCSRpxeJI66t1m2UzgMAJbTcDgfmI/pOFeyFJ7T2cBAqhy8PFyFx+vq39jSc sEIVOPxYxNyZCQtgMN/fA+Avu9pnExjZO16gwAq/vVgXACf8uNxSXj+J1/Kml1URnLc0Jg QHcA5RfAlU4NhsJFZ4D2XV3mqqTatjMebIgHV3Sp2NH6gnj4ohdbm9YQYKJ1tOOapu05sg s4LWjfuPWss+ySiPvYZdg/RMRFj6+ipP6BPpd61Hupa3oLilciGWRSWE1gpnrg== 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=1740598300; 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=L6GBab9aJ98IHHUGTi1HejEdNJvQOjpaPxKpm6b+sk0=; b=Zx8hHlgybw1dk4Lml39ooC2gTWVRjC5KRAPor3nLmvNfiKEJx3lSWaq+B8DV6j2hDnXLGW yVm5/46j3/tGkNR23JE62JFwZfGhQRv7XR6QNJicPwScIQAx8+2forY9OWqd0AEDpFiLsj LSjbDo47+ImWxpTjfiTjo02LxbZOZ3hDr7ixdxBAzu4WEmy8vpZG0nCl/xKjpyAnXpim/j AF47thIWviCRzeGmVhscGOEv2DpnCJIfyFSMHcyFuf9Uduv8MJ/F5MOQKu/A3xQk1RAk+P cEtHSlhQ0ifPPBpqUZOT4SR5PArnfTuQOidLZAAZtxQqXC4lKACymQEc53LoRg== 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 4Z34ND3lVvz1P9p; Wed, 26 Feb 2025 19:31:40 +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 51QJVeE9017657; Wed, 26 Feb 2025 19:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QJVemW017654; Wed, 26 Feb 2025 19:31:40 GMT (envelope-from git) Date: Wed, 26 Feb 2025 19:31:40 GMT Message-Id: <202502261931.51QJVemW017654@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: fdc884161187 - main - rtwn: move to using ieee80211_node_get_txrate() 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: fdc88416118759692fb1773deffe298e86cc902b Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=fdc88416118759692fb1773deffe298e86cc902b commit fdc88416118759692fb1773deffe298e86cc902b Author: Adrian Chadd AuthorDate: 2025-01-13 02:15:05 +0000 Commit: Adrian Chadd CommitDate: 2025-02-26 19:30:01 +0000 rtwn: move to using ieee80211_node_get_txrate() Migrate the transmit path to use ieee80211_node_get_txrate(), and handle VHT rates. Nothing is currently setting VHT rates, but the driver should now be ready. Differential Revision: https://reviews.freebsd.org/D48606 Reviewed by: bz --- sys/dev/rtwn/if_rtwn_tx.c | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn_tx.c b/sys/dev/rtwn/if_rtwn_tx.c index f355bc589143..2c9c246dfbb4 100644 --- a/sys/dev/rtwn/if_rtwn_tx.c +++ b/sys/dev/rtwn/if_rtwn_tx.c @@ -105,6 +105,33 @@ rtwn_get_cipher(u_int ic_cipher) return (cipher); } +static uint8_t +rtwn_tx_ratectl_to_ridx(struct rtwn_softc *sc, struct ieee80211_node *ni, + struct ieee80211_node_txrate *txr) +{ + /* TODO: this should be based on the node channel */ + struct ieee80211com *ic = &sc->sc_ic; + uint8_t ridx; + + switch (txr->type) { + case IEEE80211_NODE_TXRATE_LEGACY: + case IEEE80211_NODE_TXRATE_HT: + ridx = rate2ridx(txr->dot11rate); + break; + case IEEE80211_NODE_TXRATE_VHT: + ridx = RTWN_RIDX_VHT_MCS(txr->nss - 1, txr->mcs); + break; + default: + if (ic->ic_curmode != IEEE80211_MODE_11B) + ridx = RTWN_RIDX_OFDM36; + else + ridx = RTWN_RIDX_CCK55; + break; + } + + return (ridx); +} + static int rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, struct mbuf *m) @@ -116,7 +143,7 @@ rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, struct ieee80211_frame *wh; struct rtwn_tx_desc_common *txd; struct rtwn_tx_buf buf; - uint8_t rate, ridx, type; + uint8_t ridx, type; bool force_rate = false; u_int cipher; int ismcast; @@ -131,31 +158,31 @@ rtwn_tx_data(struct rtwn_softc *sc, struct ieee80211_node *ni, if (type == IEEE80211_FC0_TYPE_MGT || type == IEEE80211_FC0_TYPE_CTL || (m->m_flags & M_EAPOL) != 0) { - rate = tp->mgmtrate; + ridx = rate2ridx(tp->mgmtrate); force_rate = true; } else if (ismcast) { + ridx = rate2ridx(tp->mcastrate); force_rate = true; - rate = tp->mcastrate; } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { + ridx = rate2ridx(tp->ucastrate); force_rate = true; - rate = tp->ucastrate; } else { if (sc->sc_ratectl == RTWN_RATECTL_NET80211) { + struct ieee80211_node_txrate txr = { 0 }; /* XXX pass pktlen */ - (void) ieee80211_ratectl_rate(ni, NULL, 0); - rate = ieee80211_node_get_txrate_dot11rate(ni); + ieee80211_ratectl_rate(ni, NULL, 0); + ieee80211_node_get_txrate(ni, &txr); + ridx = rtwn_tx_ratectl_to_ridx(sc, ni, &txr); } else { if (ni->ni_flags & IEEE80211_NODE_HT) - rate = IEEE80211_RATE_MCS | 0x4; /* MCS4 */ + ridx = rate2ridx(IEEE80211_RATE_MCS | 0x4); /* MCS4 */ else if (ic->ic_curmode != IEEE80211_MODE_11B) - rate = ridx2rate[RTWN_RIDX_OFDM36]; + ridx = RTWN_RIDX_OFDM36; else - rate = ridx2rate[RTWN_RIDX_CCK55]; + ridx = RTWN_RIDX_CCK55; } } - ridx = rate2ridx(rate); - cipher = IEEE80211_CIPHER_NONE; if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) { k = ieee80211_crypto_encap(ni, m);