Kill nd6_output(), it doesn't do anything since the resolution logic

has been moved to nd6_resolve().

ok visa@, millert@, florian@, sthen@

1 files changed, 3 insertions, 10 deletions

diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 82d5a6b9dbc..01383bc63c0 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.185 2016/06/08 12:57:58 mpi Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.186 2016/06/15 11:49:34 mpi Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -1352,7 +1352,7 @@ fail:
 
 		if (ln->ln_state == ND6_LLINFO_STALE) {
 			/*
-			 * XXX: since nd6_output() below will cause
+			 * Since nd6_resolve() in ifp->if_output() will cause
 			 * state transition to DELAY and reset the timer,
 			 * we must set the timer now, although it is actually
 			 * meaningless.
@@ -1366,7 +1366,7 @@ fail:
 				 * we assume ifp is not a p2p here, so just
 				 * set the 2nd argument as the 1st one.
 				 */
-				nd6_output(ifp, n, satosin6(rt_key(rt)), rt);
+				ifp->if_output(ifp, n, rt_key(rt), rt);
 				if (ln->ln_hold == n) {
 					/* n is back in ln_hold. Discard. */
 					m_freem(ln->ln_hold);
@@ -1489,13 +1489,6 @@ nd6_slowtimo(void *ignored_arg)
 }
 
 int
-nd6_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr_in6 *dst,
-    struct rtentry *rt0)
-{
-	return (ifp->if_output(ifp, m0, sin6tosa(dst), rt0));
-}
-
-int
 nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m,
     struct sockaddr *dst, u_char *desten)
 {