summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-04-20 22:40:44 +0000
committerrwatson <rwatson@FreeBSD.org>2009-04-20 22:40:44 +0000
commitc869a90c838f8c1b19ebe7edd33ad2e3425bc94a (patch)
treefa64be2b6bbae5e326fd54f82f2191ffa329e5eb
parent6fc60785e72960c0c2c1b7cda150d79811e9dab9 (diff)
downloadFreeBSD-src-c869a90c838f8c1b19ebe7edd33ad2e3425bc94a.zip
FreeBSD-src-c869a90c838f8c1b19ebe7edd33ad2e3425bc94a.tar.gz
Prefer actual field names (if_addrhead, ifa_link) to macros aliasing
those field names in FreeBSD code. MFC after: 2 weeks
-rw-r--r--sys/netinet/ip_fw2.c2
-rw-r--r--sys/netinet/ip_fw_nat.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index 2c949a9..dd643df 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -594,7 +594,7 @@ search_ip6_addr_net (struct in6_addr * ip6_addr)
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;
diff --git a/sys/netinet/ip_fw_nat.c b/sys/netinet/ip_fw_nat.c
index 6ba0412..cce5086 100644
--- a/sys/netinet/ip_fw_nat.c
+++ b/sys/netinet/ip_fw_nat.c
@@ -93,7 +93,7 @@ ifaddr_change(void *arg __unused, struct ifnet *ifp)
/* ...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)
OpenPOWER on IntegriCloud