Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 9 Nov 2014 16:20:27 +0000 (UTC)
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r274316 - head/sys/netinet6
Message-ID:  <201411091620.sA9GKRQl054250@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: melifaro
Date: Sun Nov  9 16:20:27 2014
New Revision: 274316
URL: https://svnweb.freebsd.org/changeset/base/274316

Log:
  Remove unused 'struct route *' argument from nd6_output_flush().

Modified:
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6.h
  head/sys/netinet6/nd6_nbr.c

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Sun Nov  9 16:15:28 2014	(r274315)
+++ head/sys/netinet6/nd6.c	Sun Nov  9 16:20:27 2014	(r274316)
@@ -1763,7 +1763,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
 			ln = NULL;
 	}
 	if (chain)
-		nd6_output_flush(ifp, ifp, chain, &sin6, NULL);
+		nd6_output_flush(ifp, ifp, chain, &sin6);
 	
 	/*
 	 * When the link-layer address of a router changes, select the
@@ -2156,7 +2156,7 @@ nd6_output_lle(struct ifnet *ifp, struct
 
 int
 nd6_output_flush(struct ifnet *ifp, struct ifnet *origifp, struct mbuf *chain,
-    struct sockaddr_in6 *dst, struct route *ro)
+    struct sockaddr_in6 *dst)
 {
 	struct mbuf *m, *m_head;
 	struct ifnet *outifp;
@@ -2171,7 +2171,7 @@ nd6_output_flush(struct ifnet *ifp, stru
 	while (m_head) {
 		m = m_head;
 		m_head = m_head->m_nextpkt;
-		error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, ro);			       
+		error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, NULL);
 	}
 
 	/*

Modified: head/sys/netinet6/nd6.h
==============================================================================
--- head/sys/netinet6/nd6.h	Sun Nov  9 16:15:28 2014	(r274315)
+++ head/sys/netinet6/nd6.h	Sun Nov  9 16:20:27 2014	(r274316)
@@ -413,7 +413,7 @@ int nd6_output_lle(struct ifnet *, struc
 	struct sockaddr_in6 *, struct rtentry *, struct llentry *,
 	struct mbuf **);
 int nd6_output_flush(struct ifnet *, struct ifnet *, struct mbuf *,
-	struct sockaddr_in6 *, struct route *);
+	struct sockaddr_in6 *);
 int nd6_need_cache(struct ifnet *);
 int nd6_add_ifa_lle(struct in6_ifaddr *);
 void nd6_rem_ifa_lle(struct in6_ifaddr *);

Modified: head/sys/netinet6/nd6_nbr.c
==============================================================================
--- head/sys/netinet6/nd6_nbr.c	Sun Nov  9 16:15:28 2014	(r274315)
+++ head/sys/netinet6/nd6_nbr.c	Sun Nov  9 16:20:27 2014	(r274316)
@@ -921,7 +921,7 @@ nd6_na_input(struct mbuf *m, int off, in
 		LLE_WUNLOCK(ln);
 
 		if (chain)
-			nd6_output_flush(ifp, ifp, chain, &sin6, NULL);
+			nd6_output_flush(ifp, ifp, chain, &sin6);
 	}
 	if (checklink)
 		pfxlist_onlink_check();

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411091620.sA9GKRQl054250>