From nobody Fri Mar 6 17:15:41 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 4fSCj96BXBz6T6rK for ; Fri, 06 Mar 2026 17:15:41 +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 4fSCj92RHVz3GSf for ; Fri, 06 Mar 2026 17:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772817341; 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=yzl0ksdoX1/Vv+2MxQClhtKH6zvVfYzBpuQpweYoGfY=; b=CD3M83Cag/rYX822cIfK+ZMTWgpz2ovgigz0HUfxjiXZn3lXFPJMPKuza8aaWECpVD8J9B Sw21Iy4J4pLvyx+WnYC8vbLoNwLIAnhBF9FP/mUSwQ2ZNOmp2B9GCM/aYskDEu2VwsNfAV cRG8mnyPk6fm5J7NTcBbD9Ek4p5aWztw2EVUMa+R7486Eq7lf8JSlY5f54pQPTbJ+53dRi +Tp7DQEaMXFtj7BeMkeZ/A+JIYm2LDQrzXkIQueIEb61+tOXwy1ASJI8uy5EgjsSzKcafc yKpl9SjjHcgmjaSG6KVdFxLRAFqMSzlTawpNbmj5/Xo8Qb3WIbBWWyd0tcR+ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772817341; a=rsa-sha256; cv=none; b=oYVMhINmL5DtypNkAR5HnGqKgqCGyfayXb2db4tcsYBzYdpjOBP88QwJ14+BpVH9gYFV/1 qVCgeiS0Akk64nB66sNgddEinVo3EfqxyHTHjgGGgGdYrDS045ZB2a2hqFnscxeSgWXWxu oUDMetGz3CphDKL5rKZ1MQ8v9kR/PjzTMtr9ZanGPZLPjBquvQx2F9Wki+70BV+PsxMXPf 8KIX0bLq1gwMBZR+9TuHZezo8rRCQXrRMLu1x+qZejPFsYBfexSS8KvO2mmRnaoahbA5DD KrWl57aTR6ZC8EKDshRO7rt54WIyxovhmRvXiylCaWMeCuJeFhIMvKwesfZ+TA== 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=1772817341; 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=yzl0ksdoX1/Vv+2MxQClhtKH6zvVfYzBpuQpweYoGfY=; b=eyODZvwmEzaFWyAlbSBLoGHSMBZa8TbuWdtwxdzHMzj57y43eZIGL3R+Ltup7atUE44LPf Ll7qjtcEQCI11lGjJaGvOOOEPp1oftF+V1G0uq02tLgWBiha/onN5ZSdwWfizEN7jHRtb3 /RjmaA1+2KmuLWGyckqRUozGNdzUoq3iAdcYXvZ6zVDukW+sSGz1NXpmCb9E9V44LjZhk+ iWzmojOehJ4YSS14nwq2wcpD9mpHZUeaImO9/uEq/dZTE+5la2r4VAeiv7xhCxw4VnsDfb QCQ1fecnr8U1q/LchFLbWbw9hkM2MYXkF18IUJ91HbNrlf6LjWBUf4Wmcqop7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fSCj91VBrzXRQ for ; Fri, 06 Mar 2026 17:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c3e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Mar 2026 17:15:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c1567d49a832 - main - iwx: Re-activate the 32-bit boundary cross check on 64-bit architectures 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 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/main X-Git-Reftype: branch X-Git-Commit: c1567d49a8320fd23dff9dbce1186f2331538253 Auto-Submitted: auto-generated Date: Fri, 06 Mar 2026 17:15:41 +0000 Message-Id: <69ab0bbd.3c3e0.72b84d3@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c1567d49a8320fd23dff9dbce1186f2331538253 commit c1567d49a8320fd23dff9dbce1186f2331538253 Author: Olivier Certner AuthorDate: 2026-03-06 16:33:21 +0000 Commit: Olivier Certner CommitDate: 2026-03-06 17:14:25 +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 --- 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 ea1ba513734a..03ef775205e7 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -5819,7 +5819,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__)); @@ -5829,7 +5829,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__)); @@ -5841,7 +5841,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__,