From nobody Fri Mar 6 17:20:36 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 4fSCpr2fKRz6T6v3 for ; Fri, 06 Mar 2026 17:20:36 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fSCpr1xTCz3H8g for ; Fri, 06 Mar 2026 17:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772817636; 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=lzKXlrorDlywd3XlBnOoB27/hUDA+ked0G4mw1ih1Bs=; b=Xg9/TyW50HRyLmG4OZC06ad8swIdpwrMe6cEzsx+vhhenZR5Pfwd8UeoPUmSl2RKK7yC8m 63wrEMurImUArIngIBJuEXUAXVnLgIq5HM+s1MWiTYwkh7SwUkBQjPH+rJbxRv8x7qj2su Y3WFmmiMHmdQjRbfE01g71G+SINi1z+ueL4/6jbVz+cNF4WMS9RFzPu63I7lbdUx7xzLL6 Ekz/eh0oLhEnK8IeYM0j7otTuHPQGajSWegPdVbcWaTEYp46ybFlgWrQx4Hokb0SY4b0OB 71g3pNBgTJUyDi+wzOPYosNcu9sELsjIqIWeV3UMPWFhejRXueKgFsoOfHY/FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772817636; a=rsa-sha256; cv=none; b=vdXXqjtKaEu9Ooqr6eiBH0FBp112Z/dwgIgKLEJKv4EodLagRgi1jSgTGxCdQjv16e34TH Mq9ZM9kWseD6TBxtd35dc+Q4MFoxzZhdShNBPpdhePc3pwNYYFawBdf2w1Akh0MwvCa9eb ydTqZMurBoTlYfg19DqPaG/9XgEj/AD2uIGWoBhvVCCwIbBm4xHBkWLaLGXoH9X/GFyRj6 riK3MrDIP4NitQTLkM2i2vUpfR8nm/VN+QMePAtE9UR0lTrTbth06ztUJj4gBSqlZx5fUY Od71cFQcUA1lqwxg0W+ndth4SGyMc92mrYaAWAGQT7bPTGZsu7knRu+0RQc9oQ== 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=1772817636; 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=lzKXlrorDlywd3XlBnOoB27/hUDA+ked0G4mw1ih1Bs=; b=yTHSJaa07+5unUrglmx2QWcd/YnNodolIPX9Rvg6rpeIV9WzvxSjddONRgt0PJuhlgHdG3 4PvFoplFCu6tpK0qNKJIzoRXqrIjYgNblTkDqk6AqCm8VkHDJTDvidQTnxASsNPvNsDxcS AbWBjayDKvr3VPpWDXLUwm/mqf43w1sU2xLKjX/Lq2CsS8DY/fyuDAfBNszjQO6jnBQAoW tD6gyEeI3HsQXz+yalnAmvBKmTokkKlKJm8ga+vl2SJmjgwR+/uS8bZSifKKxd/t+/hVOI FsTbpOchWCgGZQ+fZ9gjFR+Zyz5nOKZHsNjlMOwpn2ztacWE+c0ittV0NNGBXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fSCpr1Vn9zXPN for ; Fri, 06 Mar 2026 17:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f205 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Mar 2026 17:20:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 815fdbd497ff - stable/15 - iwx: Re-activate the 32-bit boundary cross check on 64-bit architectures 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 815fdbd497ff0355d88d42be8bbd2582ccba2b10 Auto-Submitted: auto-generated Date: Fri, 06 Mar 2026 17:20:36 +0000 Message-Id: <69ab0ce4.3f205.cad43b0@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=815fdbd497ff0355d88d42be8bbd2582ccba2b10 commit 815fdbd497ff0355d88d42be8bbd2582ccba2b10 Author: Olivier Certner AuthorDate: 2026-03-06 16:33:21 +0000 Commit: Olivier Certner CommitDate: 2026-03-06 17:19:59 +0000 iwx: Re-activate the 32-bit boundary cross check on 64-bit architectures __SIZEOF_*__ is in bytes, not in bits... Reported by: brooks Fixes: 35da55c28dbb ("iwx: Fix 32-bit compilation") MFC after: 1 minute MFC to: stable/15 Sponsored by: The FreeBSD Foundation (cherry picked from commit c1567d49a8320fd23dff9dbce1186f2331538253) --- sys/dev/iwx/if_iwx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 6d12de0753c0..727096cb6419 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -5776,7 +5776,7 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) desc->tbs[0].tb_len = htole16(IWX_FIRST_TB_SIZE); paddr = htole64(data->cmd_paddr); memcpy(&desc->tbs[0].addr, &paddr, sizeof(paddr)); -#if __SIZEOF_SIZE_T__ > 32 +#if __SIZEOF_SIZE_T__ > 4 if (data->cmd_paddr >> 32 != (data->cmd_paddr + le32toh(desc->tbs[0].tb_len)) >> 32) DPRINTF(("%s: TB0 crosses 32bit boundary\n", __func__)); @@ -5786,7 +5786,7 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) paddr = htole64(data->cmd_paddr + IWX_FIRST_TB_SIZE); memcpy(&desc->tbs[1].addr, &paddr, sizeof(paddr)); -#if __SIZEOF_SIZE_T__ > 32 +#if __SIZEOF_SIZE_T__ > 4 if (data->cmd_paddr >> 32 != (data->cmd_paddr + le32toh(desc->tbs[1].tb_len)) >> 32) DPRINTF(("%s: TB1 crosses 32bit boundary\n", __func__)); @@ -5798,7 +5798,7 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) desc->tbs[i + 2].tb_len = htole16(seg->ds_len); paddr = htole64(seg->ds_addr); memcpy(&desc->tbs[i + 2].addr, &paddr, sizeof(paddr)); -#if __SIZEOF_SIZE_T__ > 32 +#if __SIZEOF_SIZE_T__ > 4 if (data->cmd_paddr >> 32 != (data->cmd_paddr + le32toh(desc->tbs[i + 2].tb_len)) >> 32) DPRINTF(("%s: TB%d crosses 32bit boundary\n", __func__,