From c9af3dafd55afab6d1913dbfa5f6fe1daae8cf96 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 2 Jul 2018 18:01:33 -0400
Subject: [PATCH] freebsd11_network: INTR_FAST is no more.

I didn't figure out exactly when, but the docs from FreeBSD 8 reference it
as being not just deprecated, but already removed; and indeed no drivers
we have from either FreeBSD 9 or 11 use it. The intr_wrapper system is
used in its place.
---
 src/libs/compat/freebsd11_network/bus.cpp       | 17 -----------------
 .../compat/freebsd11_network/compat/sys/bus.h   |  1 -
 2 files changed, 18 deletions(-)

diff --git a/src/libs/compat/freebsd11_network/bus.cpp b/src/libs/compat/freebsd11_network/bus.cpp
index 816878d0b3..c34b15b7ad 100644
--- a/src/libs/compat/freebsd11_network/bus.cpp
+++ b/src/libs/compat/freebsd11_network/bus.cpp
@@ -278,18 +278,6 @@ intr_wrapper(void *data)
 }
 
 
-static int32
-intr_fast_wrapper(void *data)
-{
-	struct internal_intr *intr = (struct internal_intr *)data;
-
-	intr->handler(intr->arg);
-
-	// We don't know if the interrupt has been handled.
-	return B_UNHANDLED_INTERRUPT;
-}
-
-
 static int32
 intr_handler(void *data)
 {
@@ -352,9 +340,6 @@ bus_setup_intr(device_t dev, struct resource *res, int flags,
 	if (filter != NULL) {
 		status = install_io_interrupt_handler(intr->irq,
 			(interrupt_handler)intr->filter, intr->arg, 0);
-	} else if ((flags & INTR_FAST) != 0) {
-		status = install_io_interrupt_handler(intr->irq,
-			intr_fast_wrapper, intr, B_NO_HANDLED_INFO);
 	} else {
 		snprintf(semName, sizeof(semName), "%s intr", dev->device_name);
 
@@ -426,8 +411,6 @@ bus_teardown_intr(device_t dev, struct resource *res, void *arg)
 	if (intr->filter != NULL) {
 		remove_io_interrupt_handler(intr->irq, (interrupt_handler)intr->filter,
 			intr->arg);
-	} else if (intr->flags & INTR_FAST) {
-		remove_io_interrupt_handler(intr->irq, intr_fast_wrapper, intr);
 	} else {
 		remove_io_interrupt_handler(intr->irq, intr_wrapper, intr);
 	}
diff --git a/src/libs/compat/freebsd11_network/compat/sys/bus.h b/src/libs/compat/freebsd11_network/compat/sys/bus.h
index 476c847145..2e00646147 100644
--- a/src/libs/compat/freebsd11_network/compat/sys/bus.h
+++ b/src/libs/compat/freebsd11_network/compat/sys/bus.h
@@ -69,7 +69,6 @@ struct resource_spec {
 
 enum intr_type {
 	INTR_TYPE_NET	= 4,
-	INTR_FAST		= 128,
 	INTR_MPSAFE		= 512,
 };