From nobody Sun Sep 11 12:36:59 2022 X-Original-To: dev-commits-src-branches@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 4MQTkh0XcHz4bkZq; Sun, 11 Sep 2022 12:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MQTkg751Bz3k0W; Sun, 11 Sep 2022 12:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899820; 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=D1oXBqr4w9EquDsd2fFL08kT4BWK4gYmKVqtaKaEdcE=; b=rrtR9Ud8TQCkVi16UPmtFl03B68AgtA6X3k7ctY05eGInBwZkg0tFjNvtDmQAkCEIbQ4uV +tIE8plKnm+TVn9090/oaqeuYNBd/Pmmm1UYAxhmscER4e5MsDoEHcCs9W0nngrIVtHNuZ tWfD0w08pk7Y1parqKFqJcqdqordo9P//YrLUyyjuN35CYrfgLvyjgwrB6onSgJd2YDWgd euaOfvzEzXXnLcJ1E1h7aPzN6R0pwtIhGYKY53qf/nq3QiVQq1x+us3UhiiPaROWInjgeA TyHZCUULlFDBMEZr5JFDOo7x/JntEcln3IKngSKsS7AaJylzrc1+TcO3dgYBIA== 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 4MQTkg66T0zf6p; Sun, 11 Sep 2022 12:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28BCaxam090293; Sun, 11 Sep 2022 12:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BCaxRe090292; Sun, 11 Sep 2022 12:36:59 GMT (envelope-from git) Date: Sun, 11 Sep 2022 12:36:59 GMT Message-Id: <202209111236.28BCaxRe090292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2626a4f8da5c - stable/13 - ipfilter: Remove IPL_SELECT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2626a4f8da5c01af667b3518fc9ecfc73619e6d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899820; 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=D1oXBqr4w9EquDsd2fFL08kT4BWK4gYmKVqtaKaEdcE=; b=dntPH0PcMKrFSvMcwYBLXRZdNbArygWupeA37kFwIuLYeH1RUUwimzB3Cup26MsERhvJU2 i6XGDQ+5OLJ0dGyfQj3WPHr2W3n4nhroLvIb+XKfDrZHG1xnFnV7VKPMCA650E75J6OLXv tMtNjqFfWiV13XuFbr6qeAUhrtrhHCP3v0urlhVkUGlZGsf38eqEWPCnQkiqcHzXxLBH0u hhg12uRJPbfTQxjnLHieD2nN92/dfEFBmi37MYFFdWAWLgTIrrnd8FNpWdDmCAWQ4Rm697 4kRFma3OIQm1rT6PuGJCljH0a6sgnHt2qt5T5ubwdANIw/w5Hyj2LKuMvRjEAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662899820; a=rsa-sha256; cv=none; b=yI7nyxX9HeaQ68gA8lWJoa+mZ35kY+TRTRcqOHf6C13c6Ry+AZ42qX8W1eBcuy7wi3duLv OSdjI2E8LdeWVIWrV1qgQE1Xb94vMVobKPGY2w41lwwg/WZbw5FTMFeUYrNXCZdW3lkaJq lD3DGsS9SPdZr6mWvVshg+trq+1VRuNMsOvB+O5WNrBbcTb+tT4cjZHxTMOkTaxbtLSe/L XlyUAgaDBGXi6RjalHFOcwgkWQ1DTmybYxF8uvXciezC3ChIMHWQ2i4fyJPTLHfbuoum8d QN7Ly/D0IBUACCcAajoxXCgP+5audfv6cCAHZs4b+23B4pKhPFCdNg8u8K3w1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2626a4f8da5c01af667b3518fc9ecfc73619e6d9 commit 2626a4f8da5c01af667b3518fc9ecfc73619e6d9 Author: Cy Schubert AuthorDate: 2022-03-25 03:15:49 +0000 Commit: Cy Schubert CommitDate: 2022-09-11 12:36:30 +0000 ipfilter: Remove IPL_SELECT IPL_SELECT was used for HP-UX >= 11.11 only. Remove this de trop code. (cherry picked from commit 3e81ef62f9dad4bfd4acdca1963a51f9cdadb657) --- 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 -# include -# 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); }