From nobody Tue Oct 04 13:43:56 2022 X-Original-To: dev-commits-src-main@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 4Mhf7J3GwWz4dtk1; Tue, 4 Oct 2022 13:43:56 +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 4Mhf7J2jprz3gBZ; Tue, 4 Oct 2022 13:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664891036; 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=iorqtZcnxd9hdwUwpKkD443mY+uvU7uAWzIfUBicsCk=; b=kjXluFEbgLAfQquw+AwimjP9SGc+EvkGwx/yXGGmaSw47GnWBt6MONuz4WoX5EFFCLHK4E +k/ToHljNgdySzMaxFsWf0xsMGOWm0HeMx/0JGewNbztzzk+Um+7CTgdjpghHQvMOvjULU lDZQthRIF4lC65hqryOl155aG73yWTCkuKgUPab3XB8oqFSrLeNkBdnZZHnvltWDTW/iAj NMmwbHIKyWMEAUSfjqkxwHzTKzcnyJo7uEGqaIBOojMT/fJKJv66O8CsM4itErlYJ6cq+6 iyD2anXzMsPc95DnwlVlfN0SeM2N8yPxx543nu7IVOkM3dlWYYEfHDdNOwCHpA== 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 4Mhf7J1l9vzZxH; Tue, 4 Oct 2022 13:43:56 +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 294DhuKr048019; Tue, 4 Oct 2022 13:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294Dhuvd048018; Tue, 4 Oct 2022 13:43:56 GMT (envelope-from git) Date: Tue, 4 Oct 2022 13:43:56 GMT Message-Id: <202210041343.294Dhuvd048018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 9f69c0b87da3 - main - Fix kernel build after fcb3f813f379f544f9cd2a10d18045588da0e132 . List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f69c0b87da3faa02abcedb69689b1ab1edf571a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664891036; 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=iorqtZcnxd9hdwUwpKkD443mY+uvU7uAWzIfUBicsCk=; b=YdAZKV174+/dXHhmMdozDS6nN0DotMHu77OXTc16hh989sscojSufawuk9Vs4MgcSHXI9O hMc35K7TFGaX/iDY7yOIz1rhSZMGxifPjjYUpBno8ib99Fm6zSLjnX0nKa9KfCO5DyEDzM VmieFUKwPDoTyfCVGobBVFWKSLSJL5EOpEdxqJVgpzP9yZx0jTnttSgKEKNcjFYp3HY2xE 4ldjdtlRMJtdNZQfjgwiU1s1k3Cau1lWkFID36QBINZa7T0pNbt3r40n2DYyVg0NMIld6l gxX+Wyo7wkR6SJrB4ctbTEncvtjNS4V13FOfpLa43QuYVMPsX+AQH0rirKV7rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664891036; a=rsa-sha256; cv=none; b=RAWfxNnogaHg986WwQnjeT1O0g8Hz1aAvWuWVO3tbvp7Bii5mfq2VEaCPHwTaQqZmOtRCI ulXhvu/2P+MyuADbkghWDJzSbUZdIfjKirNnjBD5GGHb6uyoI0GbGv54HR20vVi7lcigaK o9rjrBED6n5qZ7oS2n0ntRGr2QwCn7ysFYO1pCZe7VJDm6J4Xeq0qPX0v1y2QrilKEOY9m NVF7Aw2XWvNnWtBvpVL4P1AIKDaeeyT8RDzHWWOwOAGCcu3ttTnumeoDw6+9T7J+7jlbyl ZJlbLSNEklh85q6G45f3RXns0bruEu79Y470Aa4ppBYxdfaoI3C54f2HHZ5xEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=9f69c0b87da3faa02abcedb69689b1ab1edf571a commit 9f69c0b87da3faa02abcedb69689b1ab1edf571a Author: Hans Petter Selasky AuthorDate: 2022-10-04 13:41:39 +0000 Commit: Hans Petter Selasky CommitDate: 2022-10-04 13:42:51 +0000 Fix kernel build after fcb3f813f379f544f9cd2a10d18045588da0e132 . By updating function arguments for ipsec_kmod_ctlinput() which is used when loading IPSEC support via kernel modules. Differential Revision: https://reviews.freebsd.org/D36731 Sponsored by: NVIDIA Networking --- sys/netipsec/ipsec_support.h | 3 +-- sys/netipsec/subr_ipsec.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/ipsec_support.h b/sys/netipsec/ipsec_support.h index e779ba96deab..491a6ff59a2d 100644 --- a/sys/netipsec/ipsec_support.h +++ b/sys/netipsec/ipsec_support.h @@ -193,8 +193,7 @@ int ipsec_kmod_pcbctl(struct ipsec_support * const, struct inpcb *, struct sockopt *); int ipsec_kmod_capability(struct ipsec_support * const, struct mbuf *, u_int); size_t ipsec_kmod_hdrsize(struct ipsec_support * const, struct inpcb *); -int ipsec_kmod_ctlinput(struct ipsec_support * const, int, - struct sockaddr *, void *); +int ipsec_kmod_ctlinput(struct ipsec_support *, ipsec_ctlinput_param_t); int ipsec_kmod_udp_input(struct ipsec_support * const, struct mbuf *, int, int); int ipsec_kmod_udp_pcbctl(struct ipsec_support * const, struct inpcb *, struct sockopt *); diff --git a/sys/netipsec/subr_ipsec.c b/sys/netipsec/subr_ipsec.c index 13c7336154e4..3eac9d6aaad0 100644 --- a/sys/netipsec/subr_ipsec.c +++ b/sys/netipsec/subr_ipsec.c @@ -367,8 +367,8 @@ IPSEC_KMOD_METHOD(int, ipsec_kmod_forward, sc, ) IPSEC_KMOD_METHOD(int, ipsec_kmod_ctlinput, sc, - ctlinput, METHOD_DECL(struct ipsec_support * const sc, int code, - struct sockaddr *sa, void *v), METHOD_ARGS(code, sa, v) + ctlinput, METHOD_DECL(struct ipsec_support * const sc, + ipsec_ctlinput_param_t param), METHOD_ARGS(param) ) IPSEC_KMOD_METHOD(int, ipsec_kmod_output, sc,