1 files changed, 5 insertions, 7 deletions

diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index 9e7acefaa4f9..12256b045ccc 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -3420,10 +3420,10 @@ ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr)
 	 * that the peer is still connected (even if invalid,) we know
 	 * that the peer node is present, though maybe invalid.
 	 */
-	if ((hook == NULL)
-	|| NG_HOOK_NOT_VALID(hook)
-	|| NG_HOOK_NOT_VALID(NG_HOOK_PEER(hook))
-	|| NG_NODE_NOT_VALID(NG_PEER_NODE(hook))) {
+	if ((hook == NULL) ||
+	    NG_HOOK_NOT_VALID(hook) ||
+	    NG_HOOK_NOT_VALID(peer = NG_HOOK_PEER(hook)) ||
+	    NG_NODE_NOT_VALID(peernode = NG_PEER_NODE(hook))) {
 		NG_FREE_ITEM(item);
 		TRAP_ERROR();
 		return (ENETDOWN);
@@ -3432,11 +3432,9 @@ ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr)
 	/*
 	 * Transfer our interest to the other (peer) end.
 	 */
-	peer = NG_HOOK_PEER(hook);
 	NG_HOOK_REF(peer);
-	NGI_SET_HOOK(item, peer);
-	peernode = NG_PEER_NODE(hook);
 	NG_NODE_REF(peernode);
+	NGI_SET_HOOK(item, peer);
 	NGI_SET_NODE(item, peernode);
 	SET_RETADDR(item, here, retaddr);
 	return (0);