svn commit: r292953 - head/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Wed Dec 30 17:10:03 2015
New Revision: 292953
URL: https://svnweb.freebsd.org/changeset/base/292953

Log:
  This code is not in modules that need KPI stability so no need to use
  the wrapper functions as used in r252511.  We can directly use the
  locking macros.
  
  Reviewed by:		jtl, rwatson
  MFC after:		2 weeks
  Differential Revision:	https://reviews.freebsd.org/D4731

Modified:
  head/sys/netinet6/in6.c

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Wed Dec 30 16:42:09 2015	(r292952)
+++ head/sys/netinet6/in6.c	Wed Dec 30 17:10:03 2015	(r292953)
@@ -1552,7 +1552,7 @@ in6ifa_llaonifp(struct ifnet *ifp)
 
 	if (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)
 		return (NULL);
-	if_addr_rlock(ifp);
+	IF_ADDR_RLOCK(ifp);
 	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 		if (ifa->ifa_addr->sa_family != AF_INET6)
 			continue;
@@ -1562,7 +1562,7 @@ in6ifa_llaonifp(struct ifnet *ifp)
 		    IN6_IS_ADDR_MC_NODELOCAL(&sin6->sin6_addr))
 			break;
 	}
-	if_addr_runlock(ifp);
+	IF_ADDR_RUNLOCK(ifp);
 
 	return ((struct in6_ifaddr *)ifa);
 }