From owner-svn-src-head@FreeBSD.ORG Sat Jan 11 16:50:42 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9281D100; Sat, 11 Jan 2014 16:50:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E79A1FC3; Sat, 11 Jan 2014 16:50:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BGog0E049381; Sat, 11 Jan 2014 16:50:42 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BGoghA049380; Sat, 11 Jan 2014 16:50:42 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201401111650.s0BGoghA049380@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Sat, 11 Jan 2014 16:50:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260548 - head/sys/netpfil/ipfw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2014 16:50:42 -0000 Author: melifaro Date: Sat Jan 11 16:50:41 2014 New Revision: 260548 URL: http://svnweb.freebsd.org/changeset/base/260548 Log: We don't need chain write lock since we're not modifying its contents. 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 Modified: head/sys/netpfil/ipfw/ip_fw_nat.c Modified: head/sys/netpfil/ipfw/ip_fw_nat.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_nat.c Sat Jan 11 16:37:20 2014 (r260547) +++ head/sys/netpfil/ipfw/ip_fw_nat.c Sat Jan 11 16:50:41 2014 (r260548) @@ -67,11 +67,11 @@ ifaddr_change(void *arg __unused, struct 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 } if_addr_runlock(ifp); } - IPFW_WUNLOCK(chain); + IPFW_RUNLOCK(chain); } /*