svn commit: r191338 - head/sys/netinet

[Robert Watson]

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)