Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 May 2021 15:41:05 GMT
From:      Kristof Provost <kp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: a1e6442cbf36 - stable/12 - dummynet: Remove unused code
Message-ID:  <202105241541.14OFf513024010@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp:

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

commit a1e6442cbf365cae458c5579bfefd68852922bf8
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2021-05-17 11:41:39 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2021-05-24 15:40:28 +0000

    dummynet: Remove unused code
    
    We never set 'busy' and never dequeue from the pending mq. Remove this
    code.
    
    Reviewed by:    ae
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D30313
    
    (cherry picked from commit 02c44f40f984951fe34a1c5a43f40ff8147c52ca)
---
 sys/netpfil/ipfw/ip_dn_io.c      | 8 --------
 sys/netpfil/ipfw/ip_dn_private.h | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
index f746023db53c..56a7aa5c4c0c 100644
--- a/sys/netpfil/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -859,14 +859,6 @@ dummynet_io(struct mbuf **m0, int dir, struct ip_fw_args *fwa)
 	/* we could actually tag outside the lock, but who cares... */
 	if (tag_mbuf(m, dir, fwa))
 		goto dropit;
-	if (dn_cfg.busy) {
-		/* if the upper half is busy doing something expensive,
-		 * lets queue the packet and move forward
-		 */
-		mq_append(&dn_cfg.pending, m);
-		m = *m0 = NULL; /* consumed */
-		goto done; /* already active, nothing to do */
-	}
 	/* XXX locate_flowset could be optimised with a direct ref. */
 	fs = dn_ht_find(dn_cfg.fshash, fs_id, 0, NULL);
 	if (fs == NULL)
diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h
index b655a91fe758..86dd5a8a0cbb 100644
--- a/sys/netpfil/ipfw/ip_dn_private.h
+++ b/sys/netpfil/ipfw/ip_dn_private.h
@@ -171,13 +171,6 @@ struct dn_parms {
 
 	int init_done;
 
-	/* if the upper half is busy doing something long,
-	 * can set the busy flag and we will enqueue packets in
-	 * a queue for later processing.
-	 */
-	int	busy;
-	struct	mq	pending;
-
 #ifdef _KERNEL
 	/*
 	 * This file is normally used in the kernel, unless we do



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105241541.14OFf513024010>