--- src/sys/netproto/ipsec/ipsec_input.c	2004/02/14 21:15:33	1.5
+++ src/sys/netproto/ipsec/ipsec_input.c	2004/10/15 22:59:10	1.6
@@ -75,19 +75,19 @@
 #include <netinet/icmp6.h>
 #endif
 
-#include "ipsec.h"
+#include <netproto/ipsec/ipsec.h>
 #ifdef INET6
-#include "ipsec6.h"
+#include <netproto/ipsec/ipsec6.h>
 #endif
-#include "ah_var.h"
-#include "esp.h"
-#include "esp_var.h"
-#include "ipcomp_var.h"
+#include <netproto/ipsec/ah_var.h>
+#include <netproto/ipsec/esp.h>
+#include <netproto/ipsec/esp_var.h>
+#include <netproto/ipsec/ipcomp_var.h>
 
-#include "key.h"
-#include "keydb.h"
+#include <netproto/ipsec/key.h>
+#include <netproto/ipsec/keydb.h>
 
-#include "xform.h"
+#include <netproto/ipsec/xform.h>
 #include <netinet6/ip6protosw.h>
 
 #include <machine/stdarg.h>
@@ -412,7 +412,7 @@ ipsec4_common_input_cb(struct mbuf *m, s
 	/*
 	 * Re-dispatch via software interrupt.
 	 */
-	if (!IF_HANDOFF(&ipintrq, m, NULL)) {
+	if (netisr_queue(NETISR_IP, m)) {
 		IPSEC_ISTAT(sproto, espstat.esps_qfull, ahstat.ahs_qfull,
 			    ipcompstat.ipcomps_qfull);
 
@@ -420,7 +420,6 @@ ipsec4_common_input_cb(struct mbuf *m, s
 			"proto %u packet dropped\n", sproto));
 		return ENOBUFS;
 	}
-	schednetisr(NETISR_IP);
 	return 0;
 bad:
 	m_freem(m);