From nobody Wed Jun 26 04:50:20 2024 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 4W88QP02BKz5P0Cl; Wed, 26 Jun 2024 04:50:21 +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 4W88QN6Yxsz56vp; Wed, 26 Jun 2024 04:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377420; 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=IyqnednLFGx4iQGPce/T0pctij+9OYapbUuFQQYCsI0=; b=iP6ArdYqyEp30N5zx+ge0pLdAmapNw6Mx+um1wpBPh+Yx+aG07xxGlyekbzppkexP7JBz4 o7MZhEfv37eb0lNml7ThHzpLaq+9yyfq+1DICbtRbw27p8K+4VOnisR8jzm9ebZqnAB1k9 co4qnKvD6HcBpbsazRcUwbDQL05L4eFErWaUwfNu3HZqgH6XFYDM3KpAU/z88lPdfS/62l tEY/CSS3ONXAePqNoWMeNoT+Pj2rDRz8Gf/AxZ2fJyy5jDB16BGxC7qRrZe1v65NGqzUvW hvFHrV4c4Laxm90ohdjcRBqOhzJGzQ0wvg8/LNplSFqdEo/PkkDVrjS5Lx2yQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719377420; a=rsa-sha256; cv=none; b=cVSQsX04RhefwQ+nBrqpdVVFLIgi/aA6rFOLjyTkNM65gKDnb9fw6HRMxtRGaPjQ81iJy+ W9AiOMqZUHKxhO/WMqeRNFGGEFewRnGTJzrYgCwA5J7mEoW7NHjXetngLMw8xzy/Jwu/DV MUD5Y6qjWmdb3Scjbro4+KewLJSBxKrFCMV+wkR/JDfCzy7UuiGRAWVI9GGb2GhJ6infl/ 6hpXvdyymVDmfU6g5/vv/3xk8YbfeGNifaPX8t14IWZx08ONKBLX4wjoDkgpSgJW48aK82 TLHyGE+1Sq6j/NqeC5nE0iZaX4nyTOAC24ypTUtGhPomVgs9p3jvsZL0JACJ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719377420; 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=IyqnednLFGx4iQGPce/T0pctij+9OYapbUuFQQYCsI0=; b=mqWla60TC4vod/UNgJPeMEf8iJJ26EmXBMcBpYaQKbTmWc2yjcqdAwKuqShBatqtjQcihl Wsb5RUeML69S3Ypd84HVr1UnKAARZDwwDFzr9nuTyx9ESzRCzFdB/OcJDN8t4iiVkAoIZu tkl2IJPw3XLrisd8IhHrvFA7DlJYHrZLN8nbltyQ8dCGnZmSUg0of7jFGP5LHq6PlgEFFe 9Alhf0Cb6LfEjMUyg7pyyvXb8aeSbt3JR66NeTC1otlPWa+1C/3rSI0Eh5YecswYxcdEO+ xGg9Akc2HqucCRSbUZe4XHqBqpbxNTngUre/7BkL+Frna3JBWPqr0MWWZt2RQg== 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 4W88QN69VMzXBt; Wed, 26 Jun 2024 04:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45Q4oKOj063618; Wed, 26 Jun 2024 04:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q4oK2o063615; Wed, 26 Jun 2024 04:50:20 GMT (envelope-from git) Date: Wed, 26 Jun 2024 04:50:20 GMT Message-Id: <202406260450.45Q4oK2o063615@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: c04006ea039f - stable/14 - icmp: hide icmp_bandlimit_uninit() under VIMAGE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: c04006ea039f24761622caa5e2e7e188fa4b2791 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c04006ea039f24761622caa5e2e7e188fa4b2791 commit c04006ea039f24761622caa5e2e7e188fa4b2791 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-26 04:48:43 +0000 icmp: hide icmp_bandlimit_uninit() under VIMAGE The uninitialization may be executed only on a kernel with VIMAGE. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44476 (cherry picked from commit 9d7f17d7467ed8c9740730a8db7a82e4768e5177) --- sys/netinet/ip_icmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 89ba56dd1b11..39eb46fd2d90 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1118,6 +1118,7 @@ icmp_bandlimit_init(void) VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); +#ifdef VIMAGE static void icmp_bandlimit_uninit(void) { @@ -1127,6 +1128,7 @@ icmp_bandlimit_uninit(void) } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); +#endif int badport_bandlim(int which)