1 files changed, 5 insertions, 4 deletions

diff --git a/sys/netgraph/ng_echo.c b/sys/netgraph/ng_echo.c
index 337df726aec50..68a165d6eec1e 100644
--- a/sys/netgraph/ng_echo.c
+++ b/sys/netgraph/ng_echo.c
@@ -47,6 +47,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
@@ -106,7 +107,7 @@ nge_rcvdata(hook_p hook, item_p item)
 {
 	int error = 0;
 
-	NG_FWD_DATA(error, item, hook);
+	NG_FWD_ITEM_HOOK(error, item, hook);
 	return (0);
 }
 
@@ -116,9 +117,9 @@ nge_rcvdata(hook_p hook, item_p item)
 static int
 nge_disconnect(hook_p hook)
 {
-	if ((hook->node->numhooks == 0)
-	&& ((hook->node->flags & NG_INVALID) == 0)) {
-		ng_rmnode_self(hook->node);
+	if ((NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0)
+	&& (NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))) {
+		ng_rmnode_self(NG_HOOK_NODE(hook));
 	}
 	return (0);
 }