From nobody Tue Nov 12 22:01:00 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 4Xp0jS59dMz5cgY0; Tue, 12 Nov 2024 22:01:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xp0jS3TNfz4R3S; Tue, 12 Nov 2024 22:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731448860; 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=Sn+aePp01qDsqDi9uZvJUoQVEw//xFKwM3dcRfzts2Y=; b=rKxjPwHJKL0uXaKa83AkkdE1tICH4hg5VgB5ZaTbzFwuvVYAKSM53rt89ahfRgWQ2AOIkv VT0TIvhPE3m8ahpEVFUlyDICPfcN2y3ji8vAYsPpHS2eusbJIA4Wz5GAdEaDKbJPA3XV6n 9UQ5duy8Gbjc8NveTLNG/vJOFpw42KkWcXUmrYyPlRhNv8aGclPlvBn80GvB15Bg4OWKOW HdezqBcD4eONas/wOSGBD3JKr4bXJjxiBmTnSahOc1lGnWiCtxgrvyOSwClYtzXSJMVUUZ vQ/jcXAnVpsm+lnVPieRhZV6FTFM+liW5dNFb6liWGDurlcTBTr3Kd7Dq2UjIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731448860; 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=Sn+aePp01qDsqDi9uZvJUoQVEw//xFKwM3dcRfzts2Y=; b=gSQKLkML1VJbrN8Y13WQZK2yHBP3Nr7CPZnex6AN2M3fkRfPqRCcuN4Zjt/R9kIRrcTTZ9 /DbwEJ/5KloakxPYu1O+PU+zhQpPEwRb9oLX4D9nFGhIkh7Hj3O3gzunYQK/16X7ZvRRk1 4hcEK2jb0lnQhVSelbLHaSqyUF/olF0Zksmx00ln92On0P84jkVc1WRe1eRePUMSNLLZtm ACQ5IL2lZDpuIhshNgtDfqYcTXwb/EVwJ1wQ55bZDe31a+l6cvNrp78rd+PYkfGdGzqAtO OoiznxASwtoIeQsAydbHcJn9Rm+DUsH5THZzzMCa9g6HaAk1ux73nkE0AcX9Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731448860; a=rsa-sha256; cv=none; b=T3qhcIey/D75mTcoy3bFTWBSkURJ3gcS2Vrq7LJQy/6PnOvyh1NU6l7/J1YK6fMhJtCk7J 2MiVFs3ygpDXfnYiboeMgiCAeRQzvd/5Fdh3LttbKjn1sq2kKI5jgHUoMC4e4iWosUevjZ c66XurCJom6y2Dr64xxX9c0nDjY7HRLuZ5XG07myDEBNNK7SSQDjAl7BCQYGaCPsR+KkVi O0B2bvkzv74m/BfpoFl6Wyxo+3pmIAl96xPwff1tzA7oK/daZRzda/SiiTdBueXWpXOvi1 QnE6S6S4WdYNKfDWAK4EEF8KphIy90sl1FdNX0lapWKSIKR+COFwO8knveZIoQ== 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 4Xp0jS333qzSMp; Tue, 12 Nov 2024 22:01:00 +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 4ACM10ZT048882; Tue, 12 Nov 2024 22:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ACM10qq048879; Tue, 12 Nov 2024 22:01:00 GMT (envelope-from git) Date: Tue, 12 Nov 2024 22:01:00 GMT Message-Id: <202411122201.4ACM10qq048879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: fabc5e81bd04 - main - ipfilter: Remove dead code from "Virtualize ipfilter" 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fabc5e81bd041d3e04ebab6e77c8271cbd57a009 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fabc5e81bd041d3e04ebab6e77c8271cbd57a009 commit fabc5e81bd041d3e04ebab6e77c8271cbd57a009 Author: Cy Schubert AuthorDate: 2024-11-12 21:55:43 +0000 Commit: Cy Schubert CommitDate: 2024-11-12 21:58:59 +0000 ipfilter: Remove dead code from "Virtualize ipfilter" 6d8a5eacae82 virtualized ipfilter for VNET. A few remnants of old defunct code remained. Remove them. At the time it was not known if 6d8a5eacae82 would cause any issues. As it's been a number of years since the conversion was done, it's certainly safe to remove the dead code. MFC after: 1 week --- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 47dbf017c0f4..aa0de6b8678a 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -96,18 +96,6 @@ VNET_DEFINE_STATIC(eventhandler_tag, ipf_arrivetag); VNET_DEFINE_STATIC(eventhandler_tag, ipf_departtag); #define V_ipf_arrivetag VNET(ipf_arrivetag) #define V_ipf_departtag VNET(ipf_departtag) -#if 0 -/* - * Disable the "cloner" event handler; we are getting interface - * events before the firewall is fully initiallized and also no vnet - * information thus leading to uninitialised memory accesses. - * In addition it is unclear why we need it in first place. - * If it turns out to be needed, well need a dedicated event handler - * for it to deal with the ifc and the correct vnet. - */ -VNET_DEFINE_STATIC(eventhandler_tag, ipf_clonetag); -#define V_ipf_clonetag VNET(ipf_clonetag) -#endif static void ipf_ifevent(void *arg, struct ifnet *ifp); @@ -1345,10 +1333,6 @@ ipf_event_reg(void) V_ipf_departtag = EVENTHANDLER_REGISTER(ifnet_departure_event, \ ipf_ifevent, NULL, \ EVENTHANDLER_PRI_ANY); -#if 0 - V_ipf_clonetag = EVENTHANDLER_REGISTER(if_clone_event, ipf_ifevent, \ - NULL, EVENTHANDLER_PRI_ANY); -#endif } void @@ -1360,11 +1344,6 @@ ipf_event_dereg(void) if (V_ipf_departtag != NULL) { EVENTHANDLER_DEREGISTER(ifnet_departure_event, V_ipf_departtag); } -#if 0 - if (V_ipf_clonetag != NULL) { - EVENTHANDLER_DEREGISTER(if_clone_event, V_ipf_clonetag); - } -#endif }