d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r260548. We really should not use IPFW_WLOCK() here

Browse Source 
but this requires some more playing with IPFW_UH_WLOCK(). Leave till later.
This commit is contained in:
melifaro 2014-01-11 18:27:34 +00:00
parent d5bd89923f
commit 104ab6ec12
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netpfil/ipfw/ip_fw_nat.c
View File

@ -67,11 +67,11 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp)
KASSERT(curvnet == ifp->if_vnet,
("curvnet(%p) differs from iface vnet(%p)", curvnet, ifp->if_vnet));
chain = &V_layer3_chain;
IPFW_RLOCK(chain);
IPFW_WLOCK(chain);
/* Check every nat entry... */
LIST_FOREACH(ptr, &chain->nat, _next) {
/* ...using nic 'ifp->if_xname' as dynamic alias address. */
if (strncmp(ptr->if_name, if_name(ifp), IF_NAMESIZE) != 0)
if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) != 0)
continue;
if_addr_rlock(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
@ -85,7 +85,7 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp)
}
if_addr_runlock(ifp);
}
IPFW_RUNLOCK(chain);
IPFW_WUNLOCK(chain);
}
/*