From nobody Tue Oct 13 19:20:50 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 4j441b1gzsz6w24v for ; Tue, 13 Oct 2026 19:20:51 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j441Z5mxnz3Lvm for ; Tue, 13 Oct 2026 19:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791919250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H/HeA/ICrASR9QUUK/FXzAyp+lCEzVN+q6h4dymBbkM=; b=pZrUVwNLzU517IzUoZkLpRJup7BzpJIVbHvBZ9a1I3pTmsGadZww/aXTmh1cB8D77NiYZ8 25iX8yV4zPdtarrx0Rtj+YAhQxs+nLA8h1R1SMeXfTnX1DXHvMf+/i3dD8EPgDiNjdMiFF Z0NyRJxa4knvZY2cVc7dmSvB8r2T95piHLvV5XoMDrq/tK+ScUMgeWeOAX+dyaTlozUv8K Q6FqIyQvwZ1qEa0rVIM73R4NHstN26B1hodh//xKyePhm47oAs9M/aN4TDVauABZpQjVsT ijFtIvJPvk/M8JSNzHtbiLnDh0qWZmGpxTX+7NcvuPhvgMsLyUH2IY5FSFODWA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791919250; b=P2qXP6KRKOp3Lu5HwYxZdFB+ouUOyTdsgrNYSMgOwooq6poUVFXtt+5h2Gmf0WyesZaf/R PVPSQwnSPBapBx9rM1cDw57rNZ/6dV5QfRM2oM1DaBmvME9YTFORw2T057f8kTrcfVMyUF iNqv7qhQHWjSjKvHT1cj6u6jugyHdR4OkKA4sTL7ygCyYuLqJ79zDjOWOPd0wahTxQMZsx FCWyxo4yQ7a3fdnV5y1eHVQg8qQ52SLAecJ1MoZm+TqPyJfM2r9jggHIcsWFAzt6sUw0ne FQ60fDdg4F9x7YzMAlz0z9AaNr9379auJ+WXelz0fVK0mFVeChhKT/R9Vr8m+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791919250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H/HeA/ICrASR9QUUK/FXzAyp+lCEzVN+q6h4dymBbkM=; b=DKOUpy+c6FeMSTDXxMcCvYa0Ju+sq5Nc7hLJBBG2Cyw0kQCXeusTyrPEmgSsHG63oak691 /vIiPpk6oFzb4+rM8AfmdTE97SL0cftVtmzNdbkjhv1ajdL80sKMBZgA96vbyYRfpX5skH 2JIPvCuQH/PJMbtRBeCrSYnSib6p8k39weTo9Uxq+hhshOeH4IJaSqrwXXEh9452Ofy+Dw vC7K3YAmd3TMh1WrGKxPSXuUGi0ACH84M+Hav7mXKhVHzfmWiPsfS5Q97nWmNLU2Bo5zuO GztpFCP3hkuY7MRsNUq/xm53kiYSuqEXerUUhddk2usBnqU+COxqBjccqVzwCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j441Z4N75zRmR for ; Tue, 13 Oct 2026 19:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 19:20:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Cy Schubert Subject: git: 1efafdc8ca75 - stable/14 - WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1efafdc8ca75128a59b853b4ca58700411f3fddc Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 19:20:50 +0000 Message-Id: <6ace8492.42304.20d999e5@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1efafdc8ca75128a59b853b4ca58700411f3fddc commit 1efafdc8ca75128a59b853b4ca58700411f3fddc Author: Warner Losh AuthorDate: 2024-05-31 14:44:55 +0000 Commit: Cy Schubert CommitDate: 2026-10-13 19:20:06 +0000 WPA: Allow CLOCK_BOOTTIME and CLOCK_MONOTONIC to #define the same Historically, these have been differnet values, and only one was defined or they were defined as different values. Now that they are about to be the same value, add #ifdef to cope. Sponsored by: Netflix Reviewed by: olce, val_packett.cool, adrian Differential Revision: https://reviews.freebsd.org/D45418 (cherry picked from commit 676041c41ba587285bb934aa2fca290ea7208038) --- contrib/wpa/src/utils/os_unix.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix.c index 2e769ce062c3..af6f59b695c4 100644 --- a/contrib/wpa/src/utils/os_unix.c +++ b/contrib/wpa/src/utils/os_unix.c @@ -72,7 +72,6 @@ int os_get_time(struct os_time *t) return res; } - int os_get_reltime(struct os_reltime *t) { #ifndef __MACH__ @@ -97,15 +96,21 @@ int os_get_reltime(struct os_reltime *t) return 0; } switch (clock_id) { -#ifdef CLOCK_BOOTTIME +#if defined(CLOCK_BOOTTIME) case CLOCK_BOOTTIME: clock_id = CLOCK_MONOTONIC; break; #endif -#ifdef CLOCK_MONOTONIC +#if defined(CLOCK_MONOTONIC) +/* + * FreeBSD has both BOOTTIME and MONOTONIC defined to the same value, since they + * mean the same thing. FreeBSD 14.1 and ealier don't, so need this case. + */ +#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) case CLOCK_MONOTONIC: clock_id = CLOCK_REALTIME; break; +#endif #endif case CLOCK_REALTIME: return -1;