From owner-svn-src-all@FreeBSD.ORG  Mon Apr 20 22:40:44 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A75D1106564A;
	Mon, 20 Apr 2009 22:40:44 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 954DE8FC19;
	Mon, 20 Apr 2009 22:40:44 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3KMeitP060098;
	Mon, 20 Apr 2009 22:40:44 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KMei4T060096;
	Mon, 20 Apr 2009 22:40:44 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200904202240.n3KMei4T060096@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 20 Apr 2009 22:40:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191338 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 20 Apr 2009 22:40:45 -0000

Author: rwatson
Date: Mon Apr 20 22:40:44 2009
New Revision: 191338
URL: http://svn.freebsd.org/changeset/base/191338

Log:
  Prefer actual field names (if_addrhead, ifa_link) to macros aliasing
  those field names in FreeBSD code.
  
  MFC after:	2 weeks

Modified:
  head/sys/netinet/ip_fw2.c
  head/sys/netinet/ip_fw_nat.c

Modified: head/sys/netinet/ip_fw2.c
==============================================================================
--- head/sys/netinet/ip_fw2.c	Mon Apr 20 21:37:46 2009	(r191337)
+++ head/sys/netinet/ip_fw2.c	Mon Apr 20 22:40:44 2009	(r191338)
@@ -594,7 +594,7 @@ search_ip6_addr_net (struct in6_addr * i
 
 	TAILQ_FOREACH(mdc, &V_ifnet, if_link) {
 		IF_ADDR_LOCK(mdc);
-		TAILQ_FOREACH(mdc2, &mdc->if_addrhead, ifa_list) {
+		TAILQ_FOREACH(mdc2, &mdc->if_addrhead, ifa_link) {
 			if (mdc2->ifa_addr->sa_family == AF_INET6) {
 				fdm = (struct in6_ifaddr *)mdc2;
 				copia = fdm->ia_addr.sin6_addr;

Modified: head/sys/netinet/ip_fw_nat.c
==============================================================================
--- head/sys/netinet/ip_fw_nat.c	Mon Apr 20 21:37:46 2009	(r191337)
+++ head/sys/netinet/ip_fw_nat.c	Mon Apr 20 22:40:44 2009	(r191338)
@@ -93,7 +93,7 @@ ifaddr_change(void *arg __unused, struct
 		/* ...using nic 'ifp->if_xname' as dynamic alias address. */
 		if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) == 0) {
 			IF_ADDR_LOCK(ifp);
-			TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+			TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 				if (ifa->ifa_addr == NULL)
 					continue;
 				if (ifa->ifa_addr->sa_family != AF_INET)