From nobody Tue Nov 12 22:00:59 2024 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 4Xp0jR2vcPz5cghN; Tue, 12 Nov 2024 22:00:59 +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 4Xp0jR2SLTz4RBt; Tue, 12 Nov 2024 22:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731448859; 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=qnTTaecsgpucccR73mbF770pLfFIvrX3Kxjdrcyrqhc=; b=v5YWJwT/UgR8PZQ/7RK7MHVrKYeGXkOqWsKzYkfeb8d7uCv0NY+CPvN+0fkd5uqjjC9ZNr HPmw/ubomoodJ8FcyqA6pJ1QwAJ5u5xnvPSqf6Z96RfsL7rxeBaxX7mLig/VzqBCryi44z fcszJ9ygiHvHrVRteD2WiXVujAlwbcXnz6Mnjkwv39u8qn/+J0ftL5n1IdAMRH6kRELjta gctfKsa0GFPkMhP9o3dOnBCe3SorPi7nfO+kbyj28fVehBw3f3NqO/OFZ8GRFLqJl82Jeg 4gRqmyQdgRPQ+4Brm1arGPv4SoLJF/JTqRM3nLcn+v9wij2dYEQEzKRMS7bgxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731448859; 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=qnTTaecsgpucccR73mbF770pLfFIvrX3Kxjdrcyrqhc=; b=axP/5RhZStGH1jnOuEuFvX3VeJftbHFS93vDL/TiVxHr9A6X7O6sOaplbl80/rrFFbZaqf ZdgEHhu1+WHlD0DgfdfvmqvYus8JWvCCEiG9DQdFNTaTgaa9v3Hzbr1VA7XZqpQ70gonx/ DEuvgWlZ80AkO/MuB6VZtHifIKoK+9XarWX33lCW7EHrRNRWDooVuSfB0zRJPXcZQX9nNX vqi0gFhX2KOzH1+RIxuPytvmKc4pDsJ+nOg3cc/z4r9FB9VrLW7R3UdpjiBBHVI3g4nrFT dtj0fjOuGVx1Zpeju3a9D2Qn8I9mzwVqLqyxzjg0EoNP8iB9SxiCPaXnVqOlHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731448859; a=rsa-sha256; cv=none; b=uV6L1qh6XP7O5GmBth5KniZlBtI0ptZck6UTmA/jDXAbU28jJY3gWVGIUPg8C9xg5SZEH7 DinU9e007A4HfJSMjYqT0MNHnDtYWSsQNmHZHl4tM0rBkUyeLqStFS0W0RxMOr+eoadwdc VRZNT5OlVPobhG7OeMQ7d4XYMrB4ukZW0HkJGwyMl12xWvKhbLjonSHoj9ZFe4/6pMu2x9 HmDkGYMczbh7fJqE6W3fC/lBPiDxUxd4TbF4S9COZbBBMBSgxh82IArEPzYIIa9brs4kHk r/aZCVekXwzsVxYbr/PG3FYf9ew4SYnW1dQyMFzuLsYTSTaGmXSOM6x/zJQAAQ== 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 4Xp0jR23zxzScQ; Tue, 12 Nov 2024 22:00:59 +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 4ACM0xTu048828; Tue, 12 Nov 2024 22:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ACM0xBe048825; Tue, 12 Nov 2024 22:00:59 GMT (envelope-from git) Date: Tue, 12 Nov 2024 22:00:59 GMT Message-Id: <202411122200.4ACM0xBe048825@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: 6e608d2990e9 - main - ipfilter: ipfilter: Remove more dead code 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 6e608d2990e91d06eea37d168d855965357d7d8d Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6e608d2990e91d06eea37d168d855965357d7d8d commit 6e608d2990e91d06eea37d168d855965357d7d8d Author: Cy Schubert AuthorDate: 2024-11-12 21:48:18 +0000 Commit: Cy Schubert CommitDate: 2024-11-12 21:52:38 +0000 ipfilter: ipfilter: Remove more dead code This also is an artifact of the timeout(9) to callout(9) conversion done in ea3022cbbd3f5. Fixes: ea3022cbbd3f5 MFC after: 1 week --- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 3d3601ede00f..47dbf017c0f4 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -211,10 +211,6 @@ ipfattach(ipf_main_softc_t *softc) V_ipforwarding = 1; SPL_X(s); -#if 0 - softc->ipf_slow_ch = timeout(ipf_timer_func, softc, - (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT); -#endif callout_init_rw(&softc->ipf_slow_ch, &softc->ipf_global.ipf_lk, CALLOUT_SHAREDLOCK); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); @@ -238,11 +234,6 @@ ipfdetach(ipf_main_softc_t *softc) SPL_NET(s); -#if 0 - if (softc->ipf_slow_ch.callout != NULL) - untimeout(ipf_timer_func, softc, softc->ipf_slow_ch); - bzero(&softc->ipf_slow, sizeof(softc->ipf_slow)); -#endif callout_drain(&softc->ipf_slow_ch); ipf_fini_all(softc);