From nobody Sun Sep 11 12:38:22 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 4MQTmG489yz4bkdx; Sun, 11 Sep 2022 12:38:22 +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 4MQTmG3P88z3kXP; Sun, 11 Sep 2022 12:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899902; 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=+SsoLMnplac8IEQ5D3Tn3QIch7Pdp5q41bE0en66lNg=; b=RhvIetXhu8cKxPTr4FfwUAf7tuMviYJ8a2CiZkTyAa0XLlK/fpb6NWSgKaclAsu4u7paaA 8x7WR7OKJ9gFZRuMxVKnWsDNJascXP4o2BsM+C0FpE0tNjMRykBFTAhXpdCutwzY1O9KM4 PJuGJT1WjNE1fQOo9TAQS66Gc8yp/X5AwjJVCzMGwED0dUW26A6pAygQdLfCEG90/f5jFs voPCJm0WG2suk0UVO0tmU4Gfx5H0qV3uM7k/1B5cR9Uy3ksVG2AUm4j8QTr8is9O+bs1Eu V5/Wx/wgFKdqnS429IiHquhLxPNVLDE28PYRx3oxCG07UgLzrnzWufccgfFt/Q== 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 4MQTmG2SH2zf6s; Sun, 11 Sep 2022 12:38:22 +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 28BCcMSb090617; Sun, 11 Sep 2022 12:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BCcMq7090616; Sun, 11 Sep 2022 12:38:22 GMT (envelope-from git) Date: Sun, 11 Sep 2022 12:38:22 GMT Message-Id: <202209111238.28BCcMq7090616@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: 2bf2dc19224c - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 2bf2dc19224c7c34eae36c00d3757033cb1ca74a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899902; 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=+SsoLMnplac8IEQ5D3Tn3QIch7Pdp5q41bE0en66lNg=; b=u1zCQH63yRbLZ8h7ETRmm8ts2AgHpQ1urtwu0mYqu1Hm4enBuTfGbK/iAuaISxaeh98Fd/ 0qSBKrWN2Ofj9+dSUwgZTTS6/Kv6oTrXX5L0HCkTUGOUhYsQTE/XXCYvu6A4Jo+VOg7tO2 lAlo+U8nob29QePy617BaQvtCTHgXyB/CR8OblOYDOcKHSn8n95vPm+VZge9PLJ/mGbTv5 HffTkCpY+9bb8WnSC9TQ18y8/Tfe4/RNM6bp/GPMxxuYzHxyPfJQ4bcJ8utkgn/N4ezI73 Sr9djf+lQJ9bQ8o7JP78qaFTrJ8ntiUbuhtEqtunoRweRs1U8hXsrWTgImD4fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662899902; a=rsa-sha256; cv=none; b=d2U29Q7mC4AHg29BEivqmh87bm+prfN3YFcwvLEx2YJpXRKL/dYF7tTSh5y5J6TnoqgMYK vHKQYoaAIvDEKBJ5dZcf9y6oaAWFgxtJ1aMfjWuj336RAhFi4EERDLqS+706D9rCdUwMAU D8T2MwSMxF0via9RcbHuirC96eMGQjpf0oZOjPvVLHnjSMgbwhrNYaUYH03tI/rWTEqa2R K7RfKo/lwzswJLRcSdLsK5CJn6tiDYlVTBW66lCWmmmE2poq/N/prSeSYJimaz+QTrMbj3 47SvgYQoafbBoc6iAKA6EBsx3OOEahU4Gq7p47odt7NxLnkKrV9xSzkWs7ErbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2bf2dc19224c7c34eae36c00d3757033cb1ca74a commit 2bf2dc19224c7c34eae36c00d3757033cb1ca74a Author: Cy Schubert AuthorDate: 2022-03-25 03:15:49 +0000 Commit: Cy Schubert CommitDate: 2022-09-11 12:37:50 +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); }