diff options
| author | jhb <jhb@FreeBSD.org> | 2012-01-05 19:00:36 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2012-01-05 19:00:36 +0000 |
| commit | 4ef366671a65893ccd19a3fc76c415ab0d9a25f2 (patch) | |
| tree | e3a128009150d5297d5066b93f051a1a5e2375a5 /sys/netatalk | |
| parent | 219e62f17ed5852c0d61721758ef94a0587939f4 (diff) | |
| download | FreeBSD-src-4ef366671a65893ccd19a3fc76c415ab0d9a25f2.zip FreeBSD-src-4ef366671a65893ccd19a3fc76c415ab0d9a25f2.tar.gz | |
Convert all users of IF_ADDR_LOCK to use new locking macros that specify
either a read lock or write lock.
Reviewed by: bz
MFC after: 2 weeks
Diffstat (limited to 'sys/netatalk')
| -rw-r--r-- | sys/netatalk/aarp.c | 6 | ||||
| -rw-r--r-- | sys/netatalk/at_control.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index 24dc7a1..bac838f 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -406,7 +406,7 @@ at_aarpinput(struct ifnet *ifp, struct mbuf *m) * Since we don't know the net, we just look for the first * phase 1 address on the interface. */ - IF_ADDR_LOCK(ifp); + IF_ADDR_RLOCK(ifp); for (aa = (struct at_ifaddr *)TAILQ_FIRST(&ifp->if_addrhead); aa; aa = (struct at_ifaddr *)aa->aa_ifa.ifa_link.tqe_next) { @@ -416,12 +416,12 @@ at_aarpinput(struct ifnet *ifp, struct mbuf *m) } } if (aa == NULL) { - IF_ADDR_UNLOCK(ifp); + IF_ADDR_RUNLOCK(ifp); m_freem(m); return; } ifa_ref(&aa->aa_ifa); - IF_ADDR_UNLOCK(ifp); + IF_ADDR_RUNLOCK(ifp); tpa.s_net = spa.s_net = AA_SAT(aa)->sat_addr.s_net; } diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index b2d8422..cf470da 100644 --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -254,9 +254,9 @@ at_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, */ aa->aa_ifp = ifp; ifa_ref(&aa->aa_ifa); /* if_addrhead */ - IF_ADDR_LOCK(ifp); + IF_ADDR_WLOCK(ifp); TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link); - IF_ADDR_UNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); } else { /* * If we DID find one then we clobber any routes @@ -357,9 +357,9 @@ at_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, * remove the ifaddr from the interface */ ifa = (struct ifaddr *)aa; - IF_ADDR_LOCK(ifp); + IF_ADDR_WLOCK(ifp); TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link); - IF_ADDR_UNLOCK(ifp); + IF_ADDR_WUNLOCK(ifp); ifa_free(ifa); /* if_addrhead */ /* |
