Date: Fri, 11 Nov 2022 22:04:24 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: fa7b4b9294d3 - stable/13 - wg: Retire now unused support.h. Message-ID: <202211112204.2ABM4OwW005461@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fa7b4b9294d3b42eb26d1019275207f1826a706c commit fa7b4b9294d3b42eb26d1019275207f1826a706c Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-10-28 20:36:13 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-11-11 21:49:57 +0000 wg: Retire now unused support.h. Reviewed by: kevans, markj, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36912 (cherry picked from commit c640d1af2c8ade5bcad6ffcfe92ba946146e565f) --- sys/dev/wg/if_wg.c | 1 - sys/dev/wg/support.h | 21 --------------------- sys/dev/wg/wg_noise.c | 1 - 3 files changed, 23 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 61828aa03496..44234759e944 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -51,7 +51,6 @@ #include <netinet/udp_var.h> #include <netinet6/nd6.h> -#include "support.h" #include "wg_noise.h" #include "wg_cookie.h" #include "version.h" diff --git a/sys/dev/wg/support.h b/sys/dev/wg/support.h deleted file mode 100644 index 7934c5784a40..000000000000 --- a/sys/dev/wg/support.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: ISC - * - * Copyright (C) 2021 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. - * Copyright (c) 2021 Kyle Evans <kevans@FreeBSD.org> - * - * support.h contains code that is not _yet_ upstream in FreeBSD's main branch. - * It is different from compat.h, which is strictly for backports. - */ - -#ifndef _WG_SUPPORT -#define _WG_SUPPORT - -#ifndef ck_pr_store_bool -#define ck_pr_store_bool(dst, val) ck_pr_store_8((uint8_t *)(dst), (uint8_t)(val)) -#endif - -#ifndef ck_pr_load_bool -#define ck_pr_load_bool(src) ((bool)ck_pr_load_8((uint8_t *)(src))) -#endif - -#endif diff --git a/sys/dev/wg/wg_noise.c b/sys/dev/wg/wg_noise.c index 73ee712b11e9..3db74ac9580f 100644 --- a/sys/dev/wg/wg_noise.c +++ b/sys/dev/wg/wg_noise.c @@ -20,7 +20,6 @@ #include "crypto.h" #include "wg_noise.h" -#include "support.h" /* Protocol string constants */ #define NOISE_HANDSHAKE_NAME "Noise_IKpsk2_25519_ChaChaPoly_BLAKE2s"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211112204.2ABM4OwW005461>