git: 1de20ebc46e6 - main - dummynet: drop unused definitions

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=1de20ebc46e608144e51e22d26180e15437a7a4b

commit 1de20ebc46e608144e51e22d26180e15437a7a4b
Author:     Franco Fichtner <franco@opnsense.org>
AuthorDate: 2021-12-14 12:00:06 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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;