summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2016-01-21 14:11:01 +0000
committerbz <bz@FreeBSD.org>2016-01-21 14:11:01 +0000
commite8ebbaf6da046225b7745bbe670a73e8d0531958 (patch)
tree8763212ec3b79f3722ad72355efa06cc50aef302
parentc9c2f75c5ce78cda373fc385554374d5839a3b08 (diff)
downloadFreeBSD-src-e8ebbaf6da046225b7745bbe670a73e8d0531958.zip
FreeBSD-src-e8ebbaf6da046225b7745bbe670a73e8d0531958.tar.gz
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.
-rw-r--r--sys/netinet6/in6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index f07f670..e2073f5 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -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);
}
OpenPOWER on IntegriCloud