From nobody Mon Jun 29 06:34:44 2026 X-Original-To: dev-commits-src-branches@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 4gpc2Y04knz6k5CS for ; Mon, 29 Jun 2026 06:34:45 +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 4gpc2X4G0cz4HH7 for ; Mon, 29 Jun 2026 06:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782714884; 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=wCQ0YXcgw94VTkUyqP7cTKVIw+C9v5IRXP2E5HHGZ50=; b=YHPDfCz8oOgsEnv1XXpugcdn9KFWhu48vrmJ21C3k7KEu5rGmlZ33UHjwen7nFBRzx2GZM B1hkkRGEdQ7U30aV6E7eXVNkIvLN84/BCV3mj4ng7A5KuijOdftcZPAXQpZgE1BEfW96ai /1djc8+7/eNIDL2Br59AHMhthglJ/MjSNJ7wplj1NGT1iOwvoBhPcidF8w1qMK9w3bHu7s F+cdDNzg9intHYtQSUF4Av569fJ/s6Xf0lM8Rs8sv3jhuNJHBhBLlG1H8CeRKyjowQt+xM mTvPVmA0YWNcNWs+rpMDDLNnY/3ylc5SK/mpVlU0XvDu2F9+ZCzJJ4OZoLv3Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782714884; a=rsa-sha256; cv=none; b=iDStKHSugiThdvkgs38GHJ3puT+HnY72QaxxvJB/lqcd7HOJbg87GoGVuYZ2VbBLX/02bv enQEW1wEsd7j8iDOw3SF/8xrGwHuc8FU4uyXwHWUoJieqrajCmAZUBgH0h3/+G5s9pXTSR 72GnCSsMQbx8IlmoT6R/fZfC5bPEWoE8Z/hgVnXxxmAmWvkBqWwx/cUC40B6Rvy2dmiQOF g/yBRNCyWxOzyMcbCsBiIJX1HZz0igGzpEAA8xRP703pT560ddxPQ3KBNpgGepUDqntVf+ fFae8x6zaKG8Ukx4hp0PnGb1gVKJeIsnJIrDeJl6Tk1NdC0OgyfRfUcAn7YDOA== 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=1782714884; 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=wCQ0YXcgw94VTkUyqP7cTKVIw+C9v5IRXP2E5HHGZ50=; b=YTjmzN50duXXwdWDmsYHV/QhKcde7at1kdgy/OQOmI5nidODDH684Zf7A570tlLb2viMUA VSSxMSU6l2dmCBL6VpJHQVcrAQ8UR2JF+P/MSGDCi48NpL8O7ZC636Mg8b4hmd2FxUWx8P ICjcPC8aYlf1Ea4vzCj8G0SnRliljLcqc40rNrIuPNr9ffSEH0OMf7+cRvshYrk2+OLWlM OwPGmda4SPyZKbLN4ItBrHj8izwmh9wVED8H4RIrwYolXo3u0beZpqMyZINm6bpa4D8Ve2 HLh5eQVhiG3DHSWKlXET5MrDu6pi9IgxSYyKQkwxlOLvzGLA2H4KpmIgj/Tr3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpc2X38PhzmVT for ; Mon, 29 Jun 2026 06:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45ab9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 06:34:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f0eeea32cd12 - stable/15 - LinuxKPI: 802.11: consider emulate_chanctx in lkpi_sync_chanctx_cw_from_rx_bw() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: f0eeea32cd123c349ec2c18b383201656078def4 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 06:34:44 +0000 Message-Id: <6a421204.45ab9.7fd7f9d4@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0eeea32cd123c349ec2c18b383201656078def4 commit f0eeea32cd123c349ec2c18b383201656078def4 Author: Bjoern A. Zeeb AuthorDate: 2026-06-22 01:04:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-29 03:55:04 +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 (cherry picked from commit cff565a4c0335e12376ea43f99ef5328c45ce933) --- 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 d5f9ef7f15a9..ed9b3878f1d9 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);