git: 6e608d2990e9 - main - ipfilter: ipfilter: Remove more dead code
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 12 Nov 2024 22:00:59 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e608d2990e91d06eea37d168d855965357d7d8d
commit 6e608d2990e91d06eea37d168d855965357d7d8d
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-11-12 21:48:18 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
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);