From nobody Tue Oct 08 10:09:22 2024 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 4XNBZW19zSz5ZFbq; Tue, 08 Oct 2024 10:09:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNBZV2tV9z4MX9; Tue, 8 Oct 2024 10:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728382162; 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=appHaS4zFl0eJwgIbE+07dP5nj2QlIfJC+354rWHjpQ=; b=TRIsh4ohG2pOsSwNFSAXv7mzxHf4R8RlGnrB3GpMKqHku02hE8oOXtFKiUFIQduk81KXyp 7oTPVrtHJ56CALscMFs2tUYgEY8xUO3To6QHUnWl6jMhfBdqn6YtN1AzRuWqWTe+Hbf9/x KfB/cdbsG9pD6kvnU/PMC2tjA1pRUsIi/yRmOhj7ZDXIbwgmu88JfZ3HEnrWCtE0e/Qrmm SCS2jhgjzU80iNFoSKuP2AvLSgpuxSIqgBNswKjHe+tvFc2fgXxYz/GkhDYWGIX4fw49I1 RvmEGMMlL1LGn9lwYMT/mdKY6GGkqYXAw20NkP08BQS9vnyYHPUyH6uK2VYvSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728382162; 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=appHaS4zFl0eJwgIbE+07dP5nj2QlIfJC+354rWHjpQ=; b=ozpczyvKYtLJ23WZNcjY+G7sRwKEx7HBNz6fXPN73hPX5TJ+1aE92x0HCRxdNty2TZuvQp CLKgyQL7eedESghOyPjWjlAlbL2VpBEuhyhuSdyWiQYv8I+I+uuC7e4QwftLbKAZJHPqij otADuWZjQViAD/fNt/Wqg9Lf1dT60DXBnaLXgRfFaNNkPc/BxkBUbhNLsqAIxqDCHFGgwe PMMEnJ/rB4panX4jtIVGsU5QZRTufieqPw16VleEFer9c+ImWM5S3bmYQzwT0d3iDEf0MK lbbuMlHOFnfoGOXvTH0WvMUBsTddyB774QP+spvqrRUTXFJg5QOob/XY/qXtFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728382162; a=rsa-sha256; cv=none; b=QNg3Wljy7A9hoQV6LisZ9lrFxyW99au5cqRukN1DTbXOBlsOAIoMw8/ubK8DCn0nAAYQyQ UU9e5QF+2xlcG7GVAc4Gfdjq41523KQFDimMdZwpbDgdpsMuhw/u3f2ZY+8W/luj91xEcq dzcJ7Bi9YmvvnUAdU4bbg6cCbh+6t2+RoEJbO2KdN4X2J8Z8iDwwB8qlEmXEqyOcxLNYmG Jy/zJgtAQLu/Mpy2F9Pne5sncZKAdfBT7TPlk9VQAjEdcz8I03gDhEAp8QkoRU9EfRTSrV EPOwEMe66ZeKa9dQ750JWFzL4M4gBqEXOBztUe35II3Y+koWJ82EQqJYy5Fq3g== 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 4XNBZV1Ts1zR4N; Tue, 8 Oct 2024 10:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 498A9MLu059165; Tue, 8 Oct 2024 10:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498A9MvV059162; Tue, 8 Oct 2024 10:09:22 GMT (envelope-from git) Date: Tue, 8 Oct 2024 10:09:22 GMT Message-Id: <202410081009.498A9MvV059162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a31a4ddd39bb - stable/13 - if_enc(4): Make enc_add_hhooks() void 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a31a4ddd39bbdf0a5f860f980a3f7b1a97edc9a7 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a31a4ddd39bbdf0a5f860f980a3f7b1a97edc9a7 commit a31a4ddd39bbdf0a5f860f980a3f7b1a97edc9a7 Author: Zhenlei Huang AuthorDate: 2024-10-01 15:28:37 +0000 Commit: Zhenlei Huang CommitDate: 2024-10-08 10:07:18 +0000 if_enc(4): Make enc_add_hhooks() void As for the consumer `enc_add_hhooks()`, `hhook_add_hook()` will never fail for the given parameters. Meanwhile, to build the module if_enc(4), at least option INET or INET6 is required, so no need for the error EPFNOSUPPORT. No functional change intended. Reviewed by: ae MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46770 (cherry picked from commit 7643141e9314f1eac0d9ac08457410509e6829ad) (cherry picked from commit d6374ee0517f8d991eafe022e2027dd1e64a2ad1) --- sys/net/if_enc.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index acf62b1b9fcc..ba8b07c1848b 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -95,7 +95,7 @@ static int enc_output(struct ifnet *, struct mbuf *, const struct sockaddr *, struct route *); static int enc_clone_create(struct if_clone *, int, caddr_t); static void enc_clone_destroy(struct ifnet *); -static int enc_add_hhooks(struct enc_softc *); +static void enc_add_hhooks(struct enc_softc *); static void enc_remove_hhooks(struct enc_softc *); static const char encname[] = "enc"; @@ -310,13 +310,12 @@ enc_hhook(int32_t hhook_type, int32_t hhook_id, void *udata, void *ctx_data, return (0); } -static int +static void enc_add_hhooks(struct enc_softc *sc) { struct hookinfo hki; - int error; + int error __diagused; - error = EPFNOSUPPORT; hki.hook_func = enc_hhook; hki.hook_helper = NULL; hki.hook_udata = sc; @@ -325,28 +324,23 @@ enc_add_hhooks(struct enc_softc *sc) hki.hook_type = HHOOK_TYPE_IPSEC_IN; error = hhook_add_hook(V_ipsec_hhh_in[HHOOK_IPSEC_INET], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); hki.hook_type = HHOOK_TYPE_IPSEC_OUT; error = hhook_add_hook(V_ipsec_hhh_out[HHOOK_IPSEC_INET], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); #endif #ifdef INET6 hki.hook_id = AF_INET6; hki.hook_type = HHOOK_TYPE_IPSEC_IN; error = hhook_add_hook(V_ipsec_hhh_in[HHOOK_IPSEC_INET6], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); hki.hook_type = HHOOK_TYPE_IPSEC_OUT; error = hhook_add_hook(V_ipsec_hhh_out[HHOOK_IPSEC_INET6], &hki, HHOOK_WAITOK); - if (error != 0) - return (error); + MPASS(error == 0); #endif - return (error); } static void @@ -389,8 +383,7 @@ vnet_enc_init_proto(void *unused __unused) { KASSERT(V_enc_sc != NULL, ("%s: V_enc_sc is %p\n", __func__, V_enc_sc)); - if (enc_add_hhooks(V_enc_sc) != 0) - enc_clone_destroy(V_enc_sc->sc_ifp); + enc_add_hhooks(V_enc_sc); } VNET_SYSINIT(vnet_enc_init_proto, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, vnet_enc_init_proto, NULL);