diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-06-26 00:49:12 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-06-26 00:49:12 +0000 |
| commit | b12e6106871c9f9db8ac89ad07ec44bb1bf3e880 (patch) | |
| tree | 9fdd88d9a5bebfe05d7f11647be22a2df78a755b /sys/netgraph | |
| parent | 4d89029afc3eb1268a3e7e1e303889058f0d5e19 (diff) | |
| download | FreeBSD-src-b12e6106871c9f9db8ac89ad07ec44bb1bf3e880.zip FreeBSD-src-b12e6106871c9f9db8ac89ad07ec44bb1bf3e880.tar.gz | |
Update Netgraph nodes to use if_addr_rlock()/if_addr_runlock() instead
of IF_ADDR_LOCK()/IF_ADDR_UNLOCK() when iterating ifp->if_addrhead.
MFC after: 6 weeks
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/ng_eiface.c | 6 | ||||
| -rw-r--r-- | sys/netgraph/ng_iface.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index 7c89faa..27b4b45 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -466,12 +466,12 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Determine size of response and allocate it */ buflen = 0; - IF_ADDR_LOCK(ifp); + if_addr_rlock(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) buflen += SA_SIZE(ifa->ifa_addr); NG_MKRESPONSE(resp, msg, buflen, M_NOWAIT); if (resp == NULL) { - IF_ADDR_UNLOCK(ifp); + if_addr_runlock(ifp); error = ENOMEM; break; } @@ -490,7 +490,7 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook) ptr += len; buflen -= len; } - IF_ADDR_UNLOCK(ifp); + if_addr_runlock(ifp); break; } diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index d6e3d64..18c37c2 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -683,7 +683,7 @@ ng_iface_rcvmsg(node_p node, item_p item, hook_p lasthook) struct ifaddr *ifa; /* Return the first configured IP address */ - IF_ADDR_LOCK(ifp); + if_addr_rlock(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct ng_cisco_ipaddr *ips; @@ -701,7 +701,7 @@ ng_iface_rcvmsg(node_p node, item_p item, hook_p lasthook) ifa->ifa_netmask)->sin_addr; break; } - IF_ADDR_UNLOCK(ifp); + if_addr_runlock(ifp); /* No IP addresses on this interface? */ if (ifa == NULL) |
