svn commit: r294503 - stable/10/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Thu Jan 21 14:11:01 2016
New Revision: 294503
URL: https://svnweb.freebsd.org/changeset/base/294503

Log:
  MFC 292953:
  
   This code is not in modules that need KPI stability so no need to use
   the wrapper functions as used in r252511 (head).  We can directly use
   the locking macros.

Modified:
  stable/10/sys/netinet6/in6.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet6/in6.c
==============================================================================
--- stable/10/sys/netinet6/in6.c	Thu Jan 21 14:08:40 2016	(r294502)
+++ stable/10/sys/netinet6/in6.c	Thu Jan 21 14:11:01 2016	(r294503)
@@ -2003,7 +2003,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;
@@ -2013,7 +2013,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);
 }