From nobody Tue Oct 13 19:20:51 2026 X-Original-To: dev-commits-src-all@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 4j441b74v3z6w2BF 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 4j441b5mypz3Ls4 for ; Tue, 13 Oct 2026 19:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791919251; 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=gkZUi1PlEMENuWP18yBz0Rx247p6iyAIp+3xcAK1uz4=; b=N7pKBqj0+XGBySBOOBoVqNEKSGLFsipc+2ikdnlYZVw+aFA6BBL/zWd933KcedXe70ARIg JYnwsEs3ej+ySEr3kRblmdG/f8MdgjmT1x5xdyAtDrZmTvgj6J5sZbh40T/0vckMISwJ6r bsItqNbLA6g4dwVh0CAD8tU5OaPlp+0xCrWoRYtdWl4LftaLKRbM9uwWZyDRXh60lfwLvg QZTKUwTFg+lS9yjfwm2eEzG8FOdIlFA5TAy/wTy9fIF+UVttTMivKAh9rgZo4kGUqh+YOo mfd6DVYcX4enF2JK3M3Zp/o5MrbHDWvQG660wp6kj+RpBGhMbhpirZ+y15z2wg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791919251; b=l2dEGO9G9UO1WZRNVDqYfqv2JquObvcRKXv26N6NLlFaJFDV/JYD2fQSw6rJh/vGKnmRuG jj8841V7zb3aQuwgCayTGdvoU2trV98vXb1gk4Hmfp49OTa5EtFXuxt95Vfuw4N+W/0gMv uIMobmHR8UwW59x+oHb/ygrNj89/ZokfjaTMa2ThlQP6sK3d35CMJnNcatLMYgdiUhoCcy 08UvhZKK4CACSe0GlyiPB+/sAP+spEIxVtoYu6kVuKwa8314+NW5tAbxkdLiBD9m7fnBAU DZt/Pu44XBbBGXPjdzXRjWBdrLlxfFOw5zwcMFmQmViCPu2omfiOGtRQ8Me0LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791919251; 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=gkZUi1PlEMENuWP18yBz0Rx247p6iyAIp+3xcAK1uz4=; b=xGmuLnrFWpn5UkppQYEbbdZh4zvza8FKCktQx2CQQF5vo5eGVKpJvUyIM2ZfTjyTUYEwt+ MH+UlLHMnzLUpbS9y6jSTk86zgd+mR1Llw2GKqKMBFK0/gFL9bB+WA+rpWZGP35shiyB4T VrVguJ+nIYUrPjycqfYIANZ3+1ktIs5r0ZPmumfz8+1aP/vmouuNZBfkOg1MgNG3GuAhoP VyqMJg7DOCPI8E0OLG3EQ0yDab4ahsuGiLItYGDHaHRU/aVu/WOPHyf4F5MP8AHfmcL/8E NGrXcjyaF4Oc8RTPifP099vTA7HwP44WGQquwpwDaPjD5fkJZbk+WpVR4vO4ZA== 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 4j441b4qbjzSJ0 for ; Tue, 13 Oct 2026 19:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42309 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 19:20:51 +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: 8d1a813bf7c4 - stable/14 - wpa: Diff reduction with upstream List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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: 8d1a813bf7c40bfe0a01152d75283568879f5c96 Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 19:20:51 +0000 Message-Id: <6ace8493.42309.4ad5e593@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8d1a813bf7c40bfe0a01152d75283568879f5c96 commit 8d1a813bf7c40bfe0a01152d75283568879f5c96 Author: Warner Losh AuthorDate: 2024-05-31 16:02:37 +0000 Commit: Cy Schubert CommitDate: 2026-10-13 19:20:06 +0000 wpa: Diff reduction with upstream I inadvertantly added gratuitous changes to upstream. Revert the gratuitous parts of 676041c41ba5 Suggested by: cy Fixes: 676041c41ba5 Sponsored by: Netflix (cherry picked from commit cab9ccf3ff8c5722dace61a814d791aeba2751c6) --- contrib/wpa/src/utils/os_unix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix.c index af6f59b695c4..15a05958c970 100644 --- a/contrib/wpa/src/utils/os_unix.c +++ b/contrib/wpa/src/utils/os_unix.c @@ -96,12 +96,12 @@ int os_get_reltime(struct os_reltime *t) return 0; } switch (clock_id) { -#if defined(CLOCK_BOOTTIME) +#ifdef CLOCK_BOOTTIME case CLOCK_BOOTTIME: clock_id = CLOCK_MONOTONIC; break; #endif -#if defined(CLOCK_MONOTONIC) +#ifdef 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.