CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Fri Jul 25 07:12:55 UTC 2014

Modified Files:
        src/sys/arch/x86/x86: vmt.c
        src/sys/netinet6: mld6.c nd6_rtr.c

Log Message:
Use IFADDR_FOREACH for iterating if_addrlist of ifnet


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/vmt.c
cvs rdiff -u -r1.57 -r1.58 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.91 -r1.92 src/sys/netinet6/nd6_rtr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x86/x86/vmt.c
diff -u src/sys/arch/x86/x86/vmt.c:1.9 src/sys/arch/x86/x86/vmt.c:1.10
--- src/sys/arch/x86/x86/vmt.c:1.9	Sat May 17 20:44:24 2014
+++ src/sys/arch/x86/x86/vmt.c	Fri Jul 25 07:12:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.9 2014/05/17 20:44:24 rmind Exp $ */
+/* $NetBSD: vmt.c,v 1.10 2014/07/25 07:12:55 ozaki-r Exp $ */
 /* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
 
 /*
@@ -815,7 +815,7 @@ vmt_tclo_tick(void *xarg)
 				continue;
 			}
 
-			TAILQ_FOREACH(iface_addr, &iface->if_addrlist, ifa_list) {
+			IFADDR_FOREACH(iface_addr, iface) {
 				if (iface_addr->ifa_addr->sa_family != AF_INET) {
 					continue;
 				}

Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.57 src/sys/netinet6/mld6.c:1.58
--- src/sys/netinet6/mld6.c:1.57	Tue Jun 10 09:38:30 2014
+++ src/sys/netinet6/mld6.c	Fri Jul 25 07:12:55 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mld6.c,v 1.57 2014/06/10 09:38:30 joerg Exp $	*/
+/*	$NetBSD: mld6.c,v 1.58 2014/07/25 07:12:55 ozaki-r Exp $	*/
 /*	$KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.57 2014/06/10 09:38:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.58 2014/07/25 07:12:55 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -972,7 +972,7 @@ in6_multicast_sysctl(SYSCTLFN_ARGS)
 
 	if (oldp == NULL) {
 		*oldlenp = 0;
-		TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+		IFADDR_FOREACH(ifa, ifp) {
 			if (ifa->ifa_addr == NULL)
 				continue;
 			if (ifa->ifa_addr->sa_family != AF_INET6)
@@ -988,7 +988,7 @@ in6_multicast_sysctl(SYSCTLFN_ARGS)
 
 	error = 0;
 	written = 0;
-	TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
+	IFADDR_FOREACH(ifa, ifp) {
 		if (ifa->ifa_addr == NULL)
 			continue;
 		if (ifa->ifa_addr->sa_family != AF_INET6)

Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.91 src/sys/netinet6/nd6_rtr.c:1.92
--- src/sys/netinet6/nd6_rtr.c:1.91	Sat May 17 21:26:20 2014
+++ src/sys/netinet6/nd6_rtr.c	Fri Jul 25 07:12:55 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_rtr.c,v 1.91 2014/05/17 21:26:20 rmind Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.92 2014/07/25 07:12:55 ozaki-r Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.91 2014/05/17 21:26:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.92 2014/07/25 07:12:55 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -897,7 +897,7 @@ purge_detached(struct ifnet *ifp)
 {
 	struct nd_prefix *pr, *pr_next;
 	struct in6_ifaddr *ia;
-	struct ifaddr *ifa, *ifa_next;
+	struct ifaddr *ifa;
 
 	for (pr = nd_prefix.lh_first; pr; pr = pr_next) {
 		pr_next = pr->ndpr_next;
@@ -915,8 +915,7 @@ purge_detached(struct ifnet *ifp)
 		    !LIST_EMPTY(&pr->ndpr_advrtrs)))
 			continue;
 
-		for (ifa = ifp->if_addrlist.tqh_first; ifa; ifa = ifa_next) {
-			ifa_next = ifa->ifa_list.tqe_next;
+		IFADDR_FOREACH(ifa, ifp) {
 			if (ifa->ifa_addr->sa_family != AF_INET6)
 				continue;
 			ia = (struct in6_ifaddr *)ifa;