Update netisr handling; Each SWI now registers its queue, and all queue

drain routines are done by swi_net, which allows for better queue control
at some future point.  Packets may also be directly dispatched to a netisr
instead of queued, this may be of interest at some installations, but
currently defaults to off.

Reviewed by: hsu, silby, jayanth, sam
Sponsored by: DARPA, NAI Labs

1 files changed, 6 insertions, 1 deletions

diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 3caba6b..8c7d890 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -33,6 +33,7 @@
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <net/if.h>
+#include <net/netisr.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/igmp.h>
@@ -554,13 +555,17 @@ mroute_encap_input(struct mbuf *m, int off)
 
     m->m_pkthdr.rcvif = last_encap_vif->v_ifp;
 
-    (void) IF_HANDOFF(&ipintrq, m, NULL);
+    netisr_queue(NETISR_IP, m);
     /*
      * normally we would need a "schednetisr(NETISR_IP)"
      * here but we were called by ip_input and it is going
      * to loop back & try to dequeue the packet we just
      * queued as soon as we return so we avoid the
      * unnecessary software interrrupt.
+     *
+     * XXX
+     * This no longer holds - we may have direct-dispatched the packet,
+     * or there may be a queue processing limit.
      */
 }