summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/netgraph/ng_eiface.c6
-rw-r--r--sys/netgraph/ng_iface.c4
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)
OpenPOWER on IntegriCloud