From nobody Tue Jan 24 05:43:11 2023 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 4P1G8v5pJLz3bNQh; Tue, 24 Jan 2023 05:43: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 4P1G8v560Bz4SjF; Tue, 24 Jan 2023 05:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674538991; 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=twM8ifbqN8fuXUFj9oNi/C+it+USv5AzabzqLdBRAP8=; b=x3cimFfhYuFvUOe422ye7IhB0JTinlSbC3LH+2XngDBpyUCnqdYZFY425epuki7coFC1qQ Eto3Ieq+SpEyZOa2krFBIbup1x1MMRzvW+5MSl2bf2T3Mjq1AgGSbpVzqzXcMRXIG7xGAj u/zwCHGydbxhoEWgwvt74HIGcnDQj+od7Ko2GjINrb1NQ8VfkFRKpWObgRpPoaf4sv6+5+ TpRtU5CmhMWFtK8BwrhM6ilyCmp5LBlxCYZf7fcEkCTv7yaz/fHe+xUEX6XM9HDseF5uw0 Wca/ua8NMvXDGzPI0tdlC+iPX8H5BriKMqg0Rb+0t9mEAaVjEWnTy7l+oycW9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674538991; 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=twM8ifbqN8fuXUFj9oNi/C+it+USv5AzabzqLdBRAP8=; b=b3ixc4e/LDAuDTyGbY4ViF+/EccgGaZm/OFsehkiLcgcjRs6hsnjqNtKJoTORrEIZ3sRDW JIICZb08+Zla9vix7YC8n8HW4Fr1MZ9brYPXMWnTLwHapmOmA9yDh0f+E7Z+nqs7/AqL/Q FASUEjrHNf5At4fpze7aRNMhInJLC+q5C9GDcOn81qWVNb6nv3oaS7KeBHB+gg7IRyithw UjWQiQyaSQ5rTVxucsQBl9MlOWfdxuIkQFb9eumJ9rWiLJsVWU4lrCnTW5Q+lstwnnpGz7 FcapPG+cZIIGt4zp1x0fGuerd4nzx2PDyVYysV7bPfnCWO9e6o6MSKRkNKKxFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674538991; a=rsa-sha256; cv=none; b=sww3t7KxNh8qpOhk6RapCg5WiCO4Tgnrt2INrU4yx1U1lxO9mOUU1qOE2bMpb7RsfGZG4Z UZjZ4h0cT64Zv76A+SqG90MEOHVup/fE2GKYxunHs6m35BmvWsp/vVyN34wILL2gXjx0cI 3V+qOESMkQfl5DdvkRxTAR8b1xEi5NbUpXfnkkGt6zKpxGpGJPDV1A/jUrxp4sYv3URIGm zbn5p/eHmLB3JmagE/dzu/JkUnf4v5u4Iq9FVpn4kQPHxN7g/3Q6gXVJ6O8derICfEZW87 JQji0PmZT8iM83t8r753t1Tk2rZQQm4ZqHfRb6fH7igKdUUVXQj5bvnH6z23qQ== 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 4P1G8v42DTzxw6; Tue, 24 Jan 2023 05:43:11 +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 30O5hBAM061733; Tue, 24 Jan 2023 05:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O5hBqf061732; Tue, 24 Jan 2023 05:43:11 GMT (envelope-from git) Date: Tue, 24 Jan 2023 05:43:11 GMT Message-Id: <202301240543.30O5hBqf061732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 39455b3d3771 - stable/13 - wg: Drop the compat shim for sbcreatecontrol(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 39455b3d3771815daaa62c8ecf4527b56a2e8d14 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=39455b3d3771815daaa62c8ecf4527b56a2e8d14 commit 39455b3d3771815daaa62c8ecf4527b56a2e8d14 Author: John Baldwin AuthorDate: 2022-11-11 22:18:48 +0000 Commit: John Baldwin CommitDate: 2023-01-24 04:57:11 +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 (cherry picked from commit 573bd1fcf532eae35ac30d6aa2c6ff4985a60fe8) --- sys/dev/wg/compat.h | 7 ------- sys/dev/wg/if_wg.c | 4 ++-- 2 files changed, 2 insertions(+), 9 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 diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index ef4df5c0021e..94395c86f370 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -863,13 +863,13 @@ wg_send(struct wg_softc *sc, struct wg_endpoint *e, struct mbuf *m) if (e->e_local.l_in.s_addr != INADDR_ANY) control = sbcreatecontrol((caddr_t)&e->e_local.l_in, sizeof(struct in_addr), IP_SENDSRCADDR, - IPPROTO_IP, M_NOWAIT); + IPPROTO_IP); #ifdef INET6 } else if (e->e_remote.r_sa.sa_family == AF_INET6) { if (!IN6_IS_ADDR_UNSPECIFIED(&e->e_local.l_in6)) control = sbcreatecontrol((caddr_t)&e->e_local.l_pktinfo6, sizeof(struct in6_pktinfo), IPV6_PKTINFO, - IPPROTO_IPV6, M_NOWAIT); + IPPROTO_IPV6); #endif } else { m_freem(m);