From nobody Tue Dec 14 12:38:53 2021 X-Original-To: dev-commits-src-all@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 D226618D33E4; Tue, 14 Dec 2021 12:38:53 +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 4JCybx4GD6z4RKZ; Tue, 14 Dec 2021 12:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 72325586; Tue, 14 Dec 2021 12:38:53 +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 1BECcr1u059807; Tue, 14 Dec 2021 12:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BECcrkO059806; Tue, 14 Dec 2021 12:38:53 GMT (envelope-from git) Date: Tue, 14 Dec 2021 12:38:53 GMT Message-Id: <202112141238.1BECcrkO059806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1de20ebc46e6 - main - dummynet: drop unused definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1de20ebc46e608144e51e22d26180e15437a7a4b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639485533; 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=hgLMQ78yoJYZetXCzwudu4Ts3ViheeaMv5qy0zEEXmQ=; b=yY1OosuPtjNPAX+dMPkpdlstsACdjMT/8haYlA2uJRczuaNy74y5mQ0BIXu+dBMrZwKsig EOiR/9biavEHk10sF/kuxhJOjii8VyrkeERyAKih1SJaoHvOhh8F4hPrY7aL3r+DOJca/I yjtm4HTn9J7FG/NZ+oidizKFOzOKgTIBNYlmE48K7szdUidGuPeDdtIKbinH4i3peYxUL5 lIfeQoSu9Ik8iSRSD8JDp0xqygMt8xN02pzdGF5xkwJOCmCMDv//NYVrOfAAt0kQlN6/Lf 8Q/JqujwkAzLGpr23VGfJZqZ2R0HtCvguwfcG8juSc4QMBZa/if+OszDcW7Q3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639485533; a=rsa-sha256; cv=none; b=vgzCNVj2AKs4Rn2YduEWb1+i7Bcyzkwf5yrBc5rGgi5kx8isqIWTQTtWjNrq/AzpIMS/8d enLfDPMdm6FnSjaf7ADA/Y4bpfwoj4cMClSIAa/0CR7vvIR6GQe3XVqUQcQDWwB/R5gzzj vxJvoQNxqapBRindKJl5s13GSCkzCZoW3FlpuQ3L8tSG8RGb3Y0F9JdkDMHTFWFqy7CM2r wwgvauH8j/qOIdQwZNmKuZC6kBImHUuf1IGB90hIYS8qtsnFkZs9AKnJdaQYWdPuIfnHr1 BXls4Tpwon5vzO7Dhgc5CiepBLsFu4TCldDzE8Sn3AhgHF0vkdCYUbT3tXyztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1de20ebc46e608144e51e22d26180e15437a7a4b commit 1de20ebc46e608144e51e22d26180e15437a7a4b Author: Franco Fichtner AuthorDate: 2021-12-14 12:00:06 +0000 Commit: Kristof Provost CommitDate: 2021-12-14 12:01:15 +0000 dummynet: drop unused definitions Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D33429 --- sys/netpfil/ipfw/dn_aqm_pie.c | 2 -- sys/netpfil/ipfw/dn_sched_fq_codel.h | 5 +---- sys/netpfil/ipfw/dn_sched_fq_pie.c | 7 +------ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/ipfw/dn_aqm_pie.c b/sys/netpfil/ipfw/dn_aqm_pie.c index 4a55aed662f7..746b9f031220 100644 --- a/sys/netpfil/ipfw/dn_aqm_pie.c +++ b/sys/netpfil/ipfw/dn_aqm_pie.c @@ -404,7 +404,6 @@ static struct mbuf * aqm_pie_dequeue(struct dn_queue *q) { struct mbuf *m; - struct dn_flow *ni; /* stats for scheduler instance */ struct dn_aqm_pie_parms *pprms; struct pie_status *pst; aqm_time_t now; @@ -413,7 +412,6 @@ aqm_pie_dequeue(struct dn_queue *q) pst = q->aqm_status; pprms = pst->parms; - ni = &q->_si->ni; /*we extarct packet ts only when Departure Rate Estimation dis not used*/ m = pie_extract_head(q, &pkt_ts, !(pprms->flags & PIE_DEPRATEEST_ENABLED)); diff --git a/sys/netpfil/ipfw/dn_sched_fq_codel.h b/sys/netpfil/ipfw/dn_sched_fq_codel.h index dcdbc6f32e7a..2f82a63ca093 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_codel.h +++ b/sys/netpfil/ipfw/dn_sched_fq_codel.h @@ -36,11 +36,8 @@ #ifndef _IP_DN_SCHED_FQ_CODEL_H #define _IP_DN_SCHED_FQ_CODEL_H -VNET_DECLARE(unsigned long, io_pkt_drop); -#define V_io_pkt_drop VNET(io_pkt_drop) - /* list of queues */ -STAILQ_HEAD(fq_codel_list, fq_codel_flow) ; +STAILQ_HEAD(fq_codel_list, fq_codel_flow); /* fq_codel parameters including codel */ struct dn_sch_fq_codel_parms { diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c index 76215aed610a..c3de665687a3 100644 --- a/sys/netpfil/ipfw/dn_sched_fq_pie.c +++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c @@ -82,11 +82,8 @@ #define DN_SCHED_FQ_PIE 7 -VNET_DECLARE(unsigned long, io_pkt_drop); -#define V_io_pkt_drop VNET(io_pkt_drop) - /* list of queues */ -STAILQ_HEAD(fq_pie_list, fq_pie_flow) ; +STAILQ_HEAD(fq_pie_list, fq_pie_flow); /* FQ_PIE parameters including PIE */ struct dn_sch_fq_pie_parms { @@ -379,10 +376,8 @@ fq_calculate_drop_prob(void *x) struct pie_status *pst = &q->pst; struct dn_aqm_pie_parms *pprms; int64_t p, prob, oldprob; - aqm_time_t now; int p_isneg; - now = AQM_UNOW; pprms = pst->parms; prob = pst->drop_prob;