From nobody Mon Jun 29 06:34:46 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 4gpc2b0ZwVz6k5h1 for ; Mon, 29 Jun 2026 06:34:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpc2Z4l1vz4H4D for ; Mon, 29 Jun 2026 06:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782714886; 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=EooUItdW6A4UCjzddUfcxKwqmaUpKqkxbWLJL/WEvG8=; b=ysyuz3HJHi8AybYDEMMMfSGSmLvVxtE4Vv/CfFCv9g89iN/1mtftCM9Q6nls29CV+2pdIT se2mwiuw+IXkuu80C4gdWm8AxGtdrJecjmIDM+EhQmgzh7pBSHvUv/ETwPiXNANwKanSss Rv19xpzodJI1YxAx6Balh3h/mwEwWd+8GDzsq7Jcnwi+eD26bzEcx27F4yuDdrj/OvgjTz GjNhm2TmPQxBCPFvKPzf/Ge7RC12nNOShhlb8olW2eMFMZx07etKl+WLchEpdND9pxpM/v 5QKBci82HiTDuN7oLoBMHUo/27aOfjivuXoRfj2k3HJLGEPTccn4HhnTeXI74A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782714886; a=rsa-sha256; cv=none; b=Zsutv/1qgPsY6y5Bu0J+gAIx3EKzqxw9PZvTTX1dvjQM4bArCpowDXfbLyEq/u/LIwE2S8 6urpw1uz9ZeRG6lpa2j9KFw5b6VIGj7KcLzXT9e36i5cNH5JApBD45Qg+eawfS44Ph9gxx pMEWsAR+dL1oDBa56j+kjjljdRxXBHkLNrb0bHDvWE0ZDSTkCCJ5GDBmWu9stC+B+Psbz8 re4gnxtp/mVRpJ7pzCehEFslbuCM+o1hWBLps3bjTAGUOPZKzjtjwSFZIC0CDAMsKXpX7Q ajdQ2tSoc2LaLVYl0Td33QFGHRcCsZfByAUjxT+1NtnU4adCFiTEqf/5nslWNA== 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=1782714886; 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=EooUItdW6A4UCjzddUfcxKwqmaUpKqkxbWLJL/WEvG8=; b=lvctjt0Nyh88DEELTLn1cZNxAX3jN21he23jJTexI1MB3DDdcSSZybHdeE22tWrGvOpdQO kJZmec8hQFbxO9oh94gLWXdkxEfp+WPWXEXXzmT6WHMKZgXIgBWuf+iKF7OtokwjxxB96s Tpbyne9Bo3/UGwMZmE7fljITgoS/S9NiszUnexeAcN1Msdf5D82fen4QwX/hXDPy3TVyPZ KtGDcaAcTcvCtDnnn8YhKiPn/Y1W3e3OOBFAIxShXwGeoiAr+4khLtRSAK1mY2Sq6rJoMK 3G3i9wO6PWtvSCnlW9SEBf2k6EM7mr63iVmFKSD8M+FP5Zist/m5i07e0PQMkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpc2Z3KSHzmVV for ; Mon, 29 Jun 2026 06:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46b16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 06:34:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8df9c187c742 - stable/15 - LinuxKPI: 802.11: adjust timing of sync_from_ni in lkpi_sta_assoc_to_run() 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 List-Id: 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8df9c187c7425fd1c14f707a608d1479c8b249c7 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 06:34:46 +0000 Message-Id: <6a421206.46b16.2f4305af@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8df9c187c7425fd1c14f707a608d1479c8b249c7 commit 8df9c187c7425fd1c14f707a608d1479c8b249c7 Author: Bjoern A. Zeeb AuthorDate: 2026-06-22 01:16:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-29 03:55:13 +0000 LinuxKPI: 802.11: adjust timing of sync_from_ni in lkpi_sta_assoc_to_run() We used to call the (*sta_state) downcall into the driver to set the sta state to ASSOC. After that we did a lot of sync operations incl. the lkpi_sta_sync_from_ni() which does a lot of rate and bandwith adjustments. This sync call needs to happen before we set the sta to assoc as drivers rely on some of this information, e.g., ht_cap and vht_cap (and equivalents for later standards) at that point. Moving this will make, e.g., mt7921 transmit at higher rates than just basic_rates. Sponsored by: The FreeBSD Foundation (cherry picked from commit 75aadc902298005c47d2b931c483452027ceae69) --- sys/compat/linuxkpi/common/src/linux_80211.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 04874b0e340f..4ed05d32ceed 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3184,6 +3184,16 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (vap->iv_flags & IEEE80211_F_WME) sta->wme = true; #endif + bss_changed = 0; + /* + * This sync needs to happen before the sta_state change to ASSOC. + * At least mt7921 (likely all drivers) rely on, e.g., ht_cap, vht_cap, + * .. to be set at the point we go to assoc. + */ + bss_changed |= lkpi_sta_sync_from_ni(hw, vif, sta, ni, true); + if (ieee80211_hw_check(hw, HAS_RATE_CONTROL)) + lkpi_80211_mo_set_bitrate_mask(hw, vif, &lvif->br_mask); + error = lkpi_80211_mo_sta_state(hw, vif, lsta, IEEE80211_STA_ASSOC); if (error != 0) { ic_printf(vap->iv_ic, "%s:%d: mo_sta_state(ASSOC) " @@ -3194,7 +3204,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int IMPROVE("wme / conf_tx [all]"); /* Update bss info (bss_info_changed) (assoc, aid, ..). */ - bss_changed = 0; #ifdef LKPI_80211_WME bss_changed |= lkpi_wme_update(lhw, vap, true); #endif @@ -3255,7 +3264,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; IMPROVE("Is this the right spot, has net80211 done all updates already?"); - bss_changed |= lkpi_sta_sync_from_ni(hw, vif, sta, ni, true); /* Update thresholds. */ hw->wiphy->frag_threshold = vap->iv_fragthreshold;