From nobody Thu Oct 29 01:21:49 2026 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 4jFRKB2fHmz6xW0x for ; Thu, 29 Oct 2026 01:21:50 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFRK965MPz4Bpv for ; Thu, 29 Oct 2026 01:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793236909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cvj8RQnxmLW7npP5uWXgT48bWMwQ695Fa1POgRJlAmM=; b=HQK/1IS1yFU+ob+TyD0A4cdk+lm6A+2tcMFRLCEkq9k7bO4L5dnL9t5uZeIseyFuXEHtKE xBbZ8KmMcI0m2M0l/ytbKPylbPJAAphc6fzv31KAE7wPiFnj9mvmQjZOOjPiDYbKe440Fx 7rK9HY7ZyeXa0HbqoHvxQNjckaHcNf4I+Ajsq/82+g4UbiuITBu/zwhIv/o/b7mQUtWogC CTLOdYC3Li7WzgIZTO0c7xjgI9MJsPqFi4zU5RRDXkemarchHW4N81l7qlhiSQBCfao+mC pKquLU2CjBiUwqtpH7LFh8gB1vxOyOUMcre3mzrIC4Rmf3o44WBsBNaOROUkhg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793236909; b=pqsiWZJqCl5cTZ2or1C95I9yAWAwTsGV9gVPy+6K5mZPFh0JP4AeCnk+uTwqYb4WTABIen /ZpveE1i8nWgtgYKm6G9qw9b4g0ZUhAJ3adtwk9BDuABOBBoKSGUk1p+r7Mp7HmE0Tjf54 GYzQux+mwJIdHPpVMdJViN/z2TK876HUCFe/jzkH+RHh2nxR11+R9Q1JqUpXAbPeobZsIM FX9PU73pLev5t5nuakdEr1/IynaxuqChb9s5D9EDsK2H8qUa610nnceyKb0Ls5kSvuDiwn VMer9Eqbq3HnaA6g6x247/f5HNXebGI4TM2Af4OVeBhXtxGeBzcLYC8wahn5xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793236909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cvj8RQnxmLW7npP5uWXgT48bWMwQ695Fa1POgRJlAmM=; b=CVqEQVD2w8dWKMqmb2Ne+aePWSvSWcnWdNRfppcSLs7eU1PiaPyykx7v/OcKfHmwrf0w4B bwPrC+QZzQ7g1sSomYraJgnaIsNaIjNpzAR8dxR2TTkZ4OKyzvk6EgcEydGq9wpUyAJ0x9 Pl3EIveZemaToX7cpwiVfEfDJkaWrYKCIm4SkcBPJaglzdXSY1ne6Zhz9E+SJ9qrGld9df yGewI+AxxquGqjGrHGwJsRXUX6W8HS2AQW/LeAKMwb09Y6jGd1kuMRkY81jlHQGSbWozV6 goX18ZjthLfyvAugFZnk/CZ8+NmQFHgEc0j4w2rWJVA9uo6ApL27aQyNkeqMrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFRK959WnzHZn for ; Thu, 29 Oct 2026 01:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41e66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 01:21:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Mir Saheb Ali From: Adrian Chadd Subject: git: 66ecb413fe70 - main - rtwn: fix 8188f channel offset / width programming List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 66ecb413fe7061d7d515e0199dc6c06cef37ac9e Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 01:21:49 +0000 Message-Id: <6ae29fad.41e66.77cdd28b@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=66ecb413fe7061d7d515e0199dc6c06cef37ac9e commit 66ecb413fe7061d7d515e0199dc6c06cef37ac9e Author: Mir Saheb Ali AuthorDate: 2026-10-29 01:18:30 +0000 Commit: Adrian Chadd CommitDate: 2026-10-29 01:21:24 +0000 rtwn: fix 8188f channel offset / width programming * rtwn_chan2centieee() already calculates the proper centre frequency, so it doesn't need to be further offset. * Don't program R92C_RF_CHNLBW with further 20MHz wide bits; the rest of the programming works correctly for 20/40MHz operation. Tested: * Verified against the linux rtl8xxxu/8188f.c code. * Tested w/ 20 and 40MHz 11n; 40MHz is now operating at higher speed. Fixes: 2c38dc04d6f8bc84620bb3b67c8ccd9f910c4d03 --- sys/dev/rtwn/rtl8188f/r88f_chan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/rtwn/rtl8188f/r88f_chan.c b/sys/dev/rtwn/rtl8188f/r88f_chan.c index 52566a85f1e6..e9ec8f89c126 100644 --- a/sys/dev/rtwn/rtl8188f/r88f_chan.c +++ b/sys/dev/rtwn/rtl8188f/r88f_chan.c @@ -249,7 +249,6 @@ r88f_spur_calibration(struct rtwn_softc *sc, struct ieee80211_channel *c, void r88f_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c) { - struct r92c_softc *rs = sc->sc_priv; uint32_t reg; uint8_t chan, subchannel; bool sec_ch_above; @@ -302,10 +301,8 @@ r88f_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c) if (IEEE80211_IS_CHAN_HT40U(c) || IEEE80211_IS_CHAN_VHT40U(c)) { sec_ch_above = 1; - chan += 2; } else { sec_ch_above = 0; - chan -= 2; } /* Set Control channel to upper or lower. */ @@ -353,6 +350,4 @@ r88f_set_chan(struct rtwn_softc *sc, struct ieee80211_channel *c) rtwn_rf_write(sc, 0, R92C_RF_RX_G2, 0x1c6c); rtwn_rf_write(sc, 0, R88F_RF_GAIN_CCA, R88F_RF_PKTBUF_DBG_CTRL); - rtwn_rf_write(sc, 0, R92C_RF_CHNLBW, - (rs->rf_chnlbw[0] & ~0xfff) | chan | R88E_RF_CHNLBW_BW20); }