D30313.id89356.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30313.id89356.diff
View Options

	diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
	--- a/sys/netpfil/ipfw/ip_dn_io.c
	+++ b/sys/netpfil/ipfw/ip_dn_io.c
	@@ -870,14 +870,6 @@
	/* 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
	--- a/sys/netpfil/ipfw/ip_dn_private.h
	+++ b/sys/netpfil/ipfw/ip_dn_private.h
	@@ -171,13 +171,6 @@

	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