From c254a2091c0c6afce9311366b32ab9b8bb0d0bf7 Mon Sep 17 00:00:00 2001 From: "Alexander V. Chernikov" Date: Sat, 11 Jan 2014 18:27:34 +0000 Subject: [PATCH] Revert r260548. We really should not use IPFW_WLOCK() here but this requires some more playing with IPFW_UH_WLOCK(). Leave till later. --- sys/netpfil/ipfw/ip_fw_nat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index cb00fddd46bc..427a55e46f6a 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -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); } /*