git: 3e81ef62f9da - main - ipfilter: Remove IPL_SELECT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 Sep 2022 03:11:56 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e81ef62f9dad4bfd4acdca1963a51f9cdadb657
commit 3e81ef62f9dad4bfd4acdca1963a51f9cdadb657
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-03-25 03:15:49 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-09-07 02:56:35 +0000
ipfilter: Remove IPL_SELECT
IPL_SELECT was used for HP-UX >= 11.11 only. Remove this de trop code.
MFC after: 3 days
---
sys/netpfil/ipfilter/netinet/ip_log.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/sys/netpfil/ipfilter/netinet/ip_log.c b/sys/netpfil/ipfilter/netinet/ip_log.c
index 56b2620fc9a2..6e384ac44e83 100644
--- a/sys/netpfil/ipfilter/netinet/ip_log.c
+++ b/sys/netpfil/ipfilter/netinet/ip_log.c
@@ -109,13 +109,6 @@
#ifdef IPFILTER_LOG
-# if defined(IPL_SELECT)
-# include <machine/sys/user.h>
-# include <sys/kthread_iface.h>
-# define READ_COLLISION 0x001
-extern int selwait;
-# endif /* IPL_SELECT */
-
typedef struct ipf_log_softc_s {
ipfmutex_t ipl_mutex[IPL_LOGSIZE];
# if SOLARIS && defined(_KERNEL)
@@ -239,10 +232,6 @@ ipf_log_soft_init(ipf_main_softc_t *softc, void *arg)
softl->ipll[i] = NULL;
softl->iplh[i] = &softl->iplt[i];
bzero((char *)&softl->ipl_crc[i], sizeof(softl->ipl_crc[i]));
-# ifdef IPL_SELECT
- softl->iplog_ss[i].read_waiter = 0;
- softl->iplog_ss[i].state = 0;
-# endif
}
@@ -625,9 +614,6 @@ ipf_log_items(ipf_main_softc_t *softc, int unit, fr_info_t *fin, void **items,
POLLWAKEUP(unit);
# endif
SPL_X(s);
-# ifdef IPL_SELECT
- iplog_input_ready(unit);
-# endif
return (0);
}