summaryrefslogtreecommitdiffstats
path: root/sys/net/if_tun.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-06-26 00:45:20 +0000
committerrwatson <rwatson@FreeBSD.org>2009-06-26 00:45:20 +0000
commit3dffb5419c2e44b4e7e028194f1c3828fad6a7dc (patch)
treeb2ffd162276a5f916dc0ad8aa9fdb57250c5ad5f /sys/net/if_tun.c
parentc4ac6ab020126b381316fa8dcb627571af2683c8 (diff)
downloadFreeBSD-src-3dffb5419c2e44b4e7e028194f1c3828fad6a7dc.zip
FreeBSD-src-3dffb5419c2e44b4e7e028194f1c3828fad6a7dc.tar.gz
Update if_stf and if_tun to use if_addr_rlock()/if_addr_runlock() rather
than IF_ADDR_LOCK()/IF_ADDR_UNLOCK() when iterating ifp->if_addrhead. MFC after: 6 weeks
Diffstat (limited to 'sys/net/if_tun.c')
-rw-r--r--sys/net/if_tun.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 41fbb47..a9a1c62 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -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);
}
OpenPOWER on IntegriCloud