From nobody Mon Jun 22 05:31:09 2026 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 4gkGyQ48Mnz6jB6Y for ; Mon, 22 Jun 2026 05:31: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkGyQ0FBLz3qDN for ; Mon, 22 Jun 2026 05:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782106270; 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=7ZSEnQ/mVtN+WgxkIG0MG5WRJ+e4SZHt7TWCiNxyYEY=; b=snnE8Aujtjw6y2wJjYeGDerjDJbeJvRliIMmj+PvrEa5LJMqqBKPkcAYB5l/PHKoKsQunk uBFHVE3WKPI5gpkGn8Zx76aHZsP6ZJ5X6tVPgoIHR5z9jYYhOcYe/P0gidy/biHPGsQP65 Vc30ucfLk6XgIuPxMdEFsYLfuCygOg9tiOpayDpGeu2StBibeTRofVezjVIyLf0Iuaz9KA rHmyomzY6d986e2tL9UydzsaL5nuttJTQnGR9LhJK/Yp3TvPUFYBVaiuM0dZGdGauKSf9/ 634Zk334ynDJ0lafOobU7etKE6yYRmj7akdraeppJ0MkwDdgZrsjXuMttVuUKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782106270; a=rsa-sha256; cv=none; b=Qw+nPgURV3Aizkn4oamnGtVBEqLhQv1H4OOwEBVV5Xi2eU+uOwLvteiWFkZexWI1tNHfUP 9Uy/fNFzV5x/7O60KM81076tNy2KZdPwIbZ8LwnbUdWIIDJchGjB1lfYfCtO0Sr9h25W/d 3AKJKwjDwoBTydj2rubi9jwkrzQ+KY/ayZBDkNxI3EKzdvlObko934CXx04AxqGj4BqLqg SgbmXbogbly7PK+0lNgT+8sgYEwWKqF7yjkeCcW70gjoZON9xzbogLaNLQeUtjE6USycMe LiKsmaHfYM938CfvjuCNzeAMdPY5l0OIbM2lkg3AoQKu2vhDuEQMiMw/fkPmFw== 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=1782106270; 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=7ZSEnQ/mVtN+WgxkIG0MG5WRJ+e4SZHt7TWCiNxyYEY=; b=w/uG32ttj0A9D+UxUealkhjJMM0dRBSiU9cKg81mA55+zjbHYjvVOOdjoVNfcwZexhMRA6 ugL95CUH5IvR5mxQXCu7cQ0W39pARcktUyJWS35nn0rqRXO9UPDsahxdISel2BvCFGHuLU ceWFwboED4LusdLucbaeujtS64UptfZu8gDrhX1fc7PSjtn8+sArI5/bm2yGOD3GEbovCl EIuRoZS/2LpGdW2Nzc/QDBgpxNMvoVO0hFK6ZD8aDyh+FaIXkmv+xPdYqceZ7aREbvG+xH NYvbw4auDfShKMFzrNtSJYMK4WPPa4Kt9lC2eEqaAoqLBYlgHFNvNZmcFjUcaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkGyP63vgzb8G for ; Mon, 22 Jun 2026 05:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3072e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 05:31:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: cff565a4c033 - main - LinuxKPI: 802.11: consider emulate_chanctx in lkpi_sync_chanctx_cw_from_rx_bw() 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 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/main X-Git-Reftype: branch X-Git-Commit: cff565a4c0335e12376ea43f99ef5328c45ce933 Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 05:31:09 +0000 Message-Id: <6a38c89d.3072e.373c8e48@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cff565a4c0335e12376ea43f99ef5328c45ce933 commit cff565a4c0335e12376ea43f99ef5328c45ce933 Author: Bjoern A. Zeeb AuthorDate: 2026-06-22 01:04:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-22 01:21:39 +0000 LinuxKPI: 802.11: consider emulate_chanctx in lkpi_sync_chanctx_cw_from_rx_bw() Only return early if the bandwidth has not changed and we are not using emulate_chanctx or the chandef.width already matches the new bandwidth. Otherwise we have to continue to get all the values updated. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1a07213a58d6..9125ed1cb4b4 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -645,6 +645,7 @@ static void lkpi_sync_chanctx_cw_from_rx_bw(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) { + struct lkpi_hw *lhw; struct ieee80211_chanctx_conf *chanctx_conf; enum ieee80211_sta_rx_bandwidth old_bw; uint32_t changed; @@ -660,7 +661,9 @@ lkpi_sync_chanctx_cw_from_rx_bw(struct ieee80211_hw *hw, TRACE_RATES("old_bw %d sta->deflink.bandwidth %d hw->conf.chandef.width %d", old_bw, sta->deflink.bandwidth, lkpi_cw_to_rx_bw(hw->conf.chandef.width)); - if (old_bw == sta->deflink.bandwidth) + lhw = HW_TO_LHW(hw); + if (old_bw == sta->deflink.bandwidth && + (!lhw->emulate_chanctx || old_bw == lkpi_cw_to_rx_bw(hw->conf.chandef.width))) return; chanctx_conf->def.width = lkpi_rx_bw_to_cw(sta->deflink.bandwidth);