Index: head/sys/net/debugnet.c
===================================================================
--- head/sys/net/debugnet.c
+++ head/sys/net/debugnet.c
@@ -38,6 +38,7 @@
 #include <sys/systm.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
+#include <sys/eventhandler.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
Index: head/sys/netinet/netdump/netdump_client.c
===================================================================
--- head/sys/netinet/netdump/netdump_client.c
+++ head/sys/netinet/netdump/netdump_client.c
@@ -409,20 +409,13 @@
 netdump_configure(struct diocskerneldump_arg *conf, struct thread *td)
 {
 	struct ifnet *ifp;
-	struct vnet *vnet;
 
 	NETDUMP_ASSERT_WLOCKED();
 
 	if (conf->kda_iface[0] != 0) {
-		if (td != NULL)
-			vnet = TD_TO_VNET(td);
-		else
-			vnet = vnet0;
-		CURVNET_SET(vnet);
-		if (td != NULL && !IS_DEFAULT_VNET(curvnet)) {
-			CURVNET_RESTORE();
+		if (td != NULL && !IS_DEFAULT_VNET(TD_TO_VNET(td)))
 			return (EINVAL);
-		}
+		CURVNET_SET(vnet0);
 		ifp = ifunit_ref(conf->kda_iface);
 		CURVNET_RESTORE();
 	} else