git: 9f69c0b87da3 - main - Fix kernel build after fcb3f813f379f544f9cd2a10d18045588da0e132 .
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Oct 2022 13:43:56 UTC
The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=9f69c0b87da3faa02abcedb69689b1ab1edf571a commit 9f69c0b87da3faa02abcedb69689b1ab1edf571a Author: Hans Petter Selasky <hselasky@FreeBSD.org> AuthorDate: 2022-10-04 13:41:39 +0000 Commit: Hans Petter Selasky <hselasky@FreeBSD.org> 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,