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

Use epoch(9) directly instead of obsoleted KPI.

Browse Source
This commit is contained in:
Gleb Smirnoff 2019-10-14 16:37:41 +00:00
parent 961c033ef1
commit 16a72f53e2
2 changed files with 7 additions and 4 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

@ -114,10 +114,12 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp)
IPFW_UH_WLOCK(chain);
/* Check every nat entry... */
LIST_FOREACH(ptr, &chain->nat, _next) {
struct epoch_tracker et;
/* ...using nic 'ifp->if_xname' as dynamic alias address. */
if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) != 0)
continue;
if_addr_rlock(ifp);
NET_EPOCH_ENTER(et);
CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr == NULL)
continue;
@ -129,7 +131,7 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp)
LibAliasSetAddress(ptr->lib, ptr->ip);
IPFW_WUNLOCK(chain);
}
if_addr_runlock(ifp);
NET_EPOCH_EXIT(et);
}
IPFW_UH_WUNLOCK(chain);
}

5
sys/netpfil/ipfw/nptv6/nptv6.c
View File

@ -534,6 +534,7 @@ static void
nptv6_find_prefix(struct ip_fw_chain *ch, struct nptv6_cfg *cfg,
struct ifnet *ifp)
{
struct epoch_tracker et;
struct ifaddr *ifa;
struct in6_ifaddr *ia;
@ -545,7 +546,7 @@ nptv6_find_prefix(struct ip_fw_chain *ch, struct nptv6_cfg *cfg,
if (ifp == NULL)
return;
}
if_addr_rlock(ifp);
NET_EPOCH_ENTER(et);
CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
@ -558,7 +559,7 @@ nptv6_find_prefix(struct ip_fw_chain *ch, struct nptv6_cfg *cfg,
nptv6_set_external(cfg, &ia->ia_addr.sin6_addr);
break;
}
if_addr_runlock(ifp);
NET_EPOCH_EXIT(et);
if_rele(ifp);
}