system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-16 21:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update if_stf and if_tun to use if_addr_rlock()/if_addr_runlock() rather

Browse source 
than IF_ADDR_LOCK()/IF_ADDR_UNLOCK() when iterating ifp->if_addrhead.

MFC after:	6 weeks
This commit is contained in:
Robert Watson 2009-06-26 00:45:20 +00:00
parent f9ef96ca71
commit 3893212ddc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=195022
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/net/if_stf.c
View file

@ -384,7 +384,7 @@ stf_getsrcifa6(ifp)
struct sockaddr_in6 *sin6;
struct in_addr in;
IF_ADDR_LOCK(ifp);
if_addr_rlock(ifp);
TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_link) {
if (ia->ifa_addr->sa_family != AF_INET6)
continue;
@ -400,10 +400,10 @@ stf_getsrcifa6(ifp)
continue;
ifa_ref(ia);
IF_ADDR_UNLOCK(ifp);
if_addr_runlock(ifp);
return (struct in6_ifaddr *)ia;
}
IF_ADDR_UNLOCK(ifp);
if_addr_runlock(ifp);
return NULL;
}

4
sys/net/if_tun.c
View file

@ -520,7 +520,7 @@ tuninit(struct ifnet *ifp)
getmicrotime(&ifp->if_lastchange);
#ifdef INET
IF_ADDR_LOCK(ifp);
if_addr_rlock(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family == AF_INET) {
struct sockaddr_in *si;
@ -536,7 +536,7 @@ tuninit(struct ifnet *ifp)
mtx_unlock(&tp->tun_mtx);
}
}
IF_ADDR_UNLOCK(ifp);
if_addr_runlock(ifp);
#endif
return (error);
}