svn commit: r191340 - head/sys/netinet6
Robert Watson
rwatson at FreeBSD.org
Mon Apr 20 22:45:22 UTC 2009
Author: rwatson
Date: Mon Apr 20 22:45:21 2009
New Revision: 191340
URL: http://svn.freebsd.org/changeset/base/191340
Log:
Prefer structure fields (ifa_link) to macro aliases for them
(ifa_list).
MFC after: 2 weeks
Modified:
head/sys/netinet6/icmp6.c
head/sys/netinet6/in6.c
head/sys/netinet6/in6_ifattach.c
head/sys/netinet6/in6_var.h
head/sys/netinet6/nd6.c
head/sys/netinet6/nd6_rtr.c
Modified: head/sys/netinet6/icmp6.c
==============================================================================
--- head/sys/netinet6/icmp6.c Mon Apr 20 22:41:19 2009 (r191339)
+++ head/sys/netinet6/icmp6.c Mon Apr 20 22:45:21 2009 (r191340)
@@ -1689,7 +1689,7 @@ ni6_addrs(struct icmp6_nodeinfo *ni6, st
for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
addrsofif = 0;
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
ifa6 = (struct in6_ifaddr *)ifa;
@@ -1776,7 +1776,7 @@ ni6_store_addrs(struct icmp6_nodeinfo *n
for (; ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
ifa6 = (struct in6_ifaddr *)ifa;
Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c Mon Apr 20 22:41:19 2009 (r191339)
+++ head/sys/netinet6/in6.c Mon Apr 20 22:45:21 2009 (r191340)
@@ -816,7 +816,7 @@ in6_update_ifa(struct ifnet *ifp, struct
ia->ia_ifa.ifa_refcnt = 1;
IF_ADDR_LOCK(ifp);
- TAILQ_INSERT_TAIL(&ifp->if_addrhead, &ia->ia_ifa, ifa_list);
+ TAILQ_INSERT_TAIL(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
IF_ADDR_UNLOCK(ifp);
}
@@ -1178,7 +1178,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st
int s = splnet();
IF_ADDR_LOCK(ifp);
- TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_list);
+ TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
IF_ADDR_UNLOCK(ifp);
oia = ia;
@@ -1231,7 +1231,7 @@ in6_purgeif(struct ifnet *ifp)
{
struct ifaddr *ifa, *nifa;
- TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_list, nifa) {
+ TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_link, nifa) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
in6_purgeaddr(ifa);
@@ -1414,7 +1414,7 @@ in6_lifaddr_ioctl(struct socket *so, u_l
}
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
if (!cmp)
@@ -1513,7 +1513,7 @@ in6_ifinit(struct ifnet *ifp, struct in6
* and to validate the address if necessary.
*/
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
ifacount++;
@@ -1629,7 +1629,7 @@ in6ifa_ifpforlinklocal(struct ifnet *ifp
struct ifaddr *ifa;
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
if (IN6_IS_ADDR_LINKLOCAL(IFA_IN6(ifa))) {
@@ -1654,7 +1654,7 @@ in6ifa_ifpwithaddr(struct ifnet *ifp, st
struct ifaddr *ifa;
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
if (IN6_ARE_ADDR_EQUAL(addr, IFA_IN6(ifa)))
@@ -1860,7 +1860,7 @@ in6_ifawithifp(struct ifnet *ifp, struct
* If none, return one of global addresses assigned other ifs.
*/
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
if (((struct in6_ifaddr *)ifa)->ia6_flags & IN6_IFF_ANYCAST)
@@ -1896,7 +1896,7 @@ in6_ifawithifp(struct ifnet *ifp, struct
return (besta);
}
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
if (((struct in6_ifaddr *)ifa)->ia6_flags & IN6_IFF_ANYCAST)
@@ -1935,7 +1935,7 @@ in6_if_up(struct ifnet *ifp)
struct in6_ifaddr *ia;
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
ia = (struct in6_ifaddr *)ifa;
Modified: head/sys/netinet6/in6_ifattach.c
==============================================================================
--- head/sys/netinet6/in6_ifattach.c Mon Apr 20 22:41:19 2009 (r191339)
+++ head/sys/netinet6/in6_ifattach.c Mon Apr 20 22:45:21 2009 (r191340)
@@ -234,7 +234,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struc
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_LINK)
continue;
sdl = (struct sockaddr_dl *)ifa->ifa_addr;
@@ -766,14 +766,14 @@ in6_ifdetach(struct ifnet *ifp)
nd6_purge(ifp);
/* nuke any of IPv6 addresses we have */
- TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_list, next) {
+ TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_link, next) {
if (ifa->ifa_addr->sa_family != AF_INET6)
continue;
in6_purgeaddr(ifa);
}
/* undo everything done by in6_ifattach(), just in case */
- TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_list, next) {
+ TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_link, next) {
if (ifa->ifa_addr->sa_family != AF_INET6
|| !IN6_IS_ADDR_LINKLOCAL(&satosin6(&ifa->ifa_addr)->sin6_addr)) {
continue;
@@ -802,7 +802,7 @@ in6_ifdetach(struct ifnet *ifp)
/* remove from the linked list */
IF_ADDR_LOCK(ifp);
- TAILQ_REMOVE(&ifp->if_addrhead, (struct ifaddr *)ia, ifa_list);
+ TAILQ_REMOVE(&ifp->if_addrhead, (struct ifaddr *)ia, ifa_link);
IF_ADDR_UNLOCK(ifp);
IFAFREE(&ia->ia_ifa);
Modified: head/sys/netinet6/in6_var.h
==============================================================================
--- head/sys/netinet6/in6_var.h Mon Apr 20 22:41:19 2009 (r191339)
+++ head/sys/netinet6/in6_var.h Mon Apr 20 22:45:21 2009 (r191340)
@@ -503,7 +503,7 @@ MALLOC_DECLARE(M_IP6MADDR);
/* struct in6_ifaddr *ia; */ \
do { \
struct ifaddr *ifa; \
- TAILQ_FOREACH(ifa, &(ifp)->if_addrhead, ifa_list) { \
+ TAILQ_FOREACH(ifa, &(ifp)->if_addrhead, ifa_link) { \
if (ifa->ifa_addr->sa_family == AF_INET6) \
break; \
} \
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Mon Apr 20 22:41:19 2009 (r191339)
+++ head/sys/netinet6/nd6.c Mon Apr 20 22:45:21 2009 (r191340)
@@ -728,7 +728,7 @@ regen_tmpaddr(struct in6_ifaddr *ia6)
ifp = ia6->ia_ifa.ifa_ifp;
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
struct in6_ifaddr *it6;
if (ifa->ifa_addr->sa_family != AF_INET6)
Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c Mon Apr 20 22:41:19 2009 (r191339)
+++ head/sys/netinet6/nd6_rtr.c Mon Apr 20 22:45:21 2009 (r191340)
@@ -1125,7 +1125,7 @@ prelist_update(struct nd_prefixctl *new,
* "address".
*/
IF_ADDR_LOCK(ifp);
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
struct in6_ifaddr *ifa6;
u_int32_t remaininglifetime;
@@ -1598,7 +1598,7 @@ nd6_prefix_onlink(struct nd_prefix *pr)
IN6_IFF_NOTREADY | IN6_IFF_ANYCAST);
if (ifa == NULL) {
/* XXX: freebsd does not have ifa_ifwithaf */
- TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_list) {
+ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family == AF_INET6)
break;
}
More information about the svn-src-head
mailing list