From nobody Fri May 31 16:05:11 2024 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 4VrSd35G8Yz5N7Rm; Fri, 31 May 2024 16:05:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrSd34XQCz40Cp; Fri, 31 May 2024 16:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717171511; 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=T6jTY8rMCZgrUo7vsLAt+HU5ee9aMf5A2hlNGs+UGzI=; b=gB3baYUXr4PPI9j2ViVc6MI6sEEtuKbwxEth2aGQyeMvx+3IE9+Pk1RuEJgEOT0NRDYv4r vceBZpfaObquDvR1a61W7zC3uKtSWEOb6io1yu0lMiOiCTI2KS/E5uPoJmaZ/8GELj/GZ0 uaf0gBBqwuuqzEmqaTFOa41c+q/cnKppY/Lb5Z+EMb6y1FN26q9iOCcrdL40M+iFMU9p9Y D0Qpa3GRe10Mz+XK4i/1/6fJVMNOCtvEIzy0p5XLIkWatXBZMEKHPRhFT6JSCoWOrrxEiX iB4+lC8YMYxF+QKxGiZ8Tf8HY0jWHOqgM6XPQQ6fIZrONBxlxPvNLB+yqsUFfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717171511; a=rsa-sha256; cv=none; b=LsbnULy9HqXrdDEU7ffoaQ/Fo4MSR+S8zIznjXMAWs9cjSWEVneVQrUGHxEyqzsLdT7YJo MM03xcyj6+7d9LzuPgliVbwSSAjl14lRMT2rNI+myJzdhpriwX/UP/+IUAuIeQg6hKXFB+ 0g+aZKWTOdZXRWu5w2PlKiQSLAM0pxvOsPOYwGkC86nG5wsuaH70SzCrEovBLTKcF/VjiF FrrKjROkYpVs3in/ZntKepzbSd6WF7EEaoXPSgE3IZ4Ug5+90wDW0VSq1yBreFYNTfBgx4 4XbpZ9wAWVzAsXJJXzb+BfjLqZ0aXsRU6YbhgsxpWtZWOiUaCtmDH84cVF5ZDg== 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=1717171511; 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=T6jTY8rMCZgrUo7vsLAt+HU5ee9aMf5A2hlNGs+UGzI=; b=FQRtfdQDyunfnVlF97AXz2jMF4wHvQLrPTO1CSD/Y5BFLTKFBhxVh6ITVztmVt6W8VXM5B xT3jVGSJ2phYS5yba8v7d5n4IlXyi3UX5O4XpF+qlNmiYfCDK4sDrFr2ylUUer0CXa7WkZ PZLA3vCUenQsKgbHH1Ke8/B5JTTtVPhsAqrfjct5x0aeNhGFW8RgS1o68fe7/ZnVJ+Kf2H PRNXWHq1/yUdAgcql7bsRNajWwqskdY17VcXYGSg5EfKAMl9mI2ut7Bp1PDAxTg7g3ySVJ hiv0hSZuQzIOl0vOf563VLMTZRSYobaL9PDEeX7/JL+YWYnHmKatYwbn45+AVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrSd33yrxzVJP; Fri, 31 May 2024 16:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VG5BGG013454; Fri, 31 May 2024 16:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VG5BW0013451; Fri, 31 May 2024 16:05:11 GMT (envelope-from git) Date: Fri, 31 May 2024 16:05:11 GMT Message-Id: <202405311605.44VG5BW0013451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cab9ccf3ff8c - main - wpa: Diff reduction with upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cab9ccf3ff8c5722dace61a814d791aeba2751c6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cab9ccf3ff8c5722dace61a814d791aeba2751c6 commit cab9ccf3ff8c5722dace61a814d791aeba2751c6 Author: Warner Losh AuthorDate: 2024-05-31 16:02:37 +0000 Commit: Warner Losh CommitDate: 2024-05-31 16:02:37 +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 --- 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 a856179fb3b1..c2f9e4fd1306 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.