The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=02c44f40f984951fe34a1c5a43f40ff8147c52ca
commit 02c44f40f984951fe34a1c5a43f40ff8147c52ca
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2021-05-17 11:41:39 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2021-05-17 13:03:55 +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
---
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 b439d2679f3c..4a65bd0ef798 100644
--- a/sys/netpfil/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -870,14 +870,6 @@ dummynet_io(struct mbuf **m0, 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 6e48bc5116a7..e6e699bf35b2 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
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
