From owner-svn-src-all@FreeBSD.ORG  Sat Jan 11 18:27:35 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 187ACB7D;
 Sat, 11 Jan 2014 18:27:35 +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 03C79166F;
 Sat, 11 Jan 2014 18:27:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BIRYCm085684;
 Sat, 11 Jan 2014 18:27:34 GMT
 (envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BIRYdV085683;
 Sat, 11 Jan 2014 18:27:34 GMT
 (envelope-from melifaro@svn.freebsd.org)
Message-Id: <201401111827.s0BIRYdV085683@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sat, 11 Jan 2014 18:27:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260551 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jan 2014 18:27:35 -0000

Author: melifaro
Date: Sat Jan 11 18:27:34 2014
New Revision: 260551
URL: http://svnweb.freebsd.org/changeset/base/260551

Log:
  Revert r260548. We really should not use IPFW_WLOCK() here
  but this requires some more playing with IPFW_UH_WLOCK(). Leave till later.

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 17:37:53 2014	(r260550)
+++ head/sys/netpfil/ipfw/ip_fw_nat.c	Sat Jan 11 18:27:34 2014	(r260551)
@@ -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_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
 		}
 		if_addr_runlock(ifp);
 	}
-	IPFW_RUNLOCK(chain);
+	IPFW_WUNLOCK(chain);
 }
 
 /*