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

We don't need chain write lock since we're not modifying its contents.

Browse Source 
LibAliasSetAddress() uses its own mutex to serialize changes.

While here, convert ifp->if_xname access to if_name() function.

MFC after:	2 weeks
Sponsored by:	Yandex LLC
This commit is contained in:
melifaro 2014-01-11 16:50:41 +00:00
parent ccc6bb570f
commit 9f930faa0d
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_WLOCK(chain);
IPFW_RLOCK(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, ifp->if_xname, IF_NAMESIZE) != 0)
if (strncmp(ptr->if_name, if_name(ifp), 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_WUNLOCK(chain);
IPFW_RUNLOCK(chain);
}
/*