From nobody Fri Nov 11 22:22:36 2022 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 4N8CrD58Mbz4gKbr; Fri, 11 Nov 2022 22:22:36 +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 4N8CrD4LjJz3HhT; Fri, 11 Nov 2022 22:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668205356; 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=idF7RKa9NW1oLN/oobww4tN/gNYRknwm8Yy7+SFCEhM=; b=cEorZdx9qgBk/6YMzxCuI6cfC+b9gQhnr+OE3SOvVo5jisMsk+wVMQAi05GTawwlT9/5yi w0AKewVcLLRMkvnqpYHBEtLKwWVMCfSSwd9eBEV21heavxVl038Itm56BfjYDhfy+wxah4 FYg+PIP8lD9k9S0hljeIWtYYK/QuDJ2WJ581/ltRJHpdy8K713FVYG6R/qfsG7RtiJJmnA 3IKMgm4KJitYVg3ZoKJ9iyVvrv+o9auXUgFIIcOSnuJ+ZXVAkm7x+/kNgnRx86yQFsXxhh ESjzo5MNlB2Xkm9n19mWnEmEjbofHI8xjtOJGS0xWAYZ5m2L/U8eel416E5JMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668205356; 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=idF7RKa9NW1oLN/oobww4tN/gNYRknwm8Yy7+SFCEhM=; b=efRwj1id1ko3FI3fG3Yfib9UEwfvrRhxEaqaiU5BuNigizSSBHB5AaJUNMYU3rTDiYe1Pu rpdJGlQsGFN2VGTtGzBxHLiCv2/RZvdRSdsa8TZdNhrwLD8KaX+Pax0vD8NRXOmStZsX2w Rde1F8OnyOeKYTG9mgNM/zJpERwyW/ZDeytQsyYYoS2TD60dEqePFHTQ1o6Wd9JN9YWv/7 K7PZ8IHpx09L687seDdtcktGQAI7TmU1wbFqHVecAPg3M/JyhNdWqXlbqG5AuWUDFqhPZf 71n2yMuq+epof12M6XY7bIKYi9imQLhNt0RLdCRlA7XfU4b3il9/i5dJGGMtCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668205356; a=rsa-sha256; cv=none; b=VZoA/BMAOoO//QCox7LZZv0YI2PBnYBX4iiuhwMr3ZLql5M0saVdns0prp/2dzF+187OIC LwR24L80PDPsdBKYp0bWpS+NSwMTAa8R9EYpE0keIMkXZ6Xu5GaZ6v2rwZONsQEkdeQyq6 XvM3ki3BvwGogU6NfY+ygz0f9RBrfXmJZO74qCsNCHF2wwz1gg8dSX+t0gfVAtxaY6jDMq K0I8wX3in7QLkVrhB0O3C6cWrGMaKJR7RELc4j3KYCkOEx1td3fITKQpTlSq3YEf6642fx BdWHv6YhntzmPw6seQ2W/HJeG1Ct3ZxqNT1+85abvF5zQNYZd5h1tIQzK+V6eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N8CrD3SCqz10QY; Fri, 11 Nov 2022 22:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ABMMadY033856; Fri, 11 Nov 2022 22:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABMMaLG033855; Fri, 11 Nov 2022 22:22:36 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:22:36 GMT Message-Id: <202211112222.2ABMMaLG033855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 573bd1fcf532 - main - wg: Drop the compat shim for sbcreatecontrol(). 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 573bd1fcf532eae35ac30d6aa2c6ff4985a60fe8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=573bd1fcf532eae35ac30d6aa2c6ff4985a60fe8 commit 573bd1fcf532eae35ac30d6aa2c6ff4985a60fe8 Author: John Baldwin AuthorDate: 2022-11-11 22:18:48 +0000 Commit: John Baldwin CommitDate: 2022-11-11 22:18:48 +0000 wg: Drop the compat shim for sbcreatecontrol(). I had to make a few other changes when merging the driver to stable/13 anyway, so adjusting this as well isn't really a big deal. MFC after: 3 days --- sys/dev/wg/compat.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/wg/compat.h b/sys/dev/wg/compat.h index 29f6ea92a50e..72bbf8c3571d 100644 --- a/sys/dev/wg/compat.h +++ b/sys/dev/wg/compat.h @@ -7,11 +7,4 @@ * It is different from support.h, which is for code that is not _yet_ upstream. */ -#include - #define COMPAT_NEED_BLAKE2S - -#if __FreeBSD_version < 1400059 -#include -#define sbcreatecontrol(a, b, c, d, e) sbcreatecontrol(a, b, c, d) -#endif