5 files changed, 7 insertions, 14 deletions

diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index f7d575b..b9ab8b3 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -92,8 +92,7 @@ in_localaddr(in)
 			if ((i & ia->ia_netmask) == ia->ia_net)
 				return (1);
 	} else {
-		for (ia = TAILQ_FIRST(&in_ifaddrhead); ia;
-		     ia = TAILQ_NEXT(ia, ia_link))
+		TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link)
 			if ((i & ia->ia_subnetmask) == ia->ia_subnet)
 				return (1);
 	}
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index a27339b..17955ad 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -350,8 +350,7 @@ gif_encapcheck4(m, off, proto, arg)
 		return 0;
 	}
 	/* reject packets with broadcast on source */
-	for (ia4 = TAILQ_FIRST(&in_ifaddrhead); ia4;
-	     ia4 = TAILQ_NEXT(ia4, ia_link))
+	TAILQ_FOREACH(ia4, &in_ifaddrhead, ia_link)
 	{
 		if ((ia4->ia_ifa.ifa_ifp->if_flags & IFF_BROADCAST) == 0)
 			continue;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 6db09f6..3f99451 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -459,8 +459,7 @@ in_pcbladdr(inp, nam, plocal_sin)
 			imo = inp->inp_moptions;
 			if (imo->imo_multicast_ifp != NULL) {
 				ifp = imo->imo_multicast_ifp;
-				for (ia = TAILQ_FIRST(&in_ifaddrhead); ia;
-				     ia = TAILQ_NEXT(ia, ia_link))
+				TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link)
 					if (ia->ia_ifp == ifp)
 						break;
 				if (ia == 0)
@@ -858,8 +857,7 @@ in_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay)
 			 * Port is in use by one or more PCBs. Look for best
 			 * fit.
 			 */
-			for (inp = LIST_FIRST(&phd->phd_pcblist); inp != NULL;
-			    inp = LIST_NEXT(inp, inp_portlist)) {
+			LIST_FOREACH(inp, &phd->phd_pcblist, inp_portlist) {
 				wildcard = 0;
 #ifdef INET6
 				if ((inp->inp_vflag & INP_IPV4) == 0)
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 7552234..ca36031 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -494,8 +494,7 @@ pass:
 	    (m->m_flags & (M_MCAST|M_BCAST)) == 0)
 		goto ours;
 
-	for (ia = TAILQ_FIRST(&in_ifaddrhead); ia;
-					ia = TAILQ_NEXT(ia, ia_link)) {
+	TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) {
 #define	satosin(sa)	((struct sockaddr_in *)(sa))
 
 #ifdef BOOTP_COMPAT
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 00147da..9a876ee 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -314,8 +314,7 @@ ip_output(m0, opt, ro, flags, imo)
 		if (ip->ip_src.s_addr == INADDR_ANY) {
 			register struct in_ifaddr *ia1;
 
-			for (ia1 = TAILQ_FIRST(&in_ifaddrhead); ia1;
-			     ia1 = TAILQ_NEXT(ia1, ia_link))
+			TAILQ_FOREACH(ia1, &in_ifaddrhead, ia_link)
 				if (ia1->ia_ifp == ifp) {
 					ip->ip_src = IA_SIN(ia1)->sin_addr;
 					break;
@@ -581,8 +580,7 @@ sendit:
 			 * as the packet runs through ip_input() as
 			 * it is done through a ISR.
 			 */
-			for (ia = TAILQ_FIRST(&in_ifaddrhead); ia;
-					ia = TAILQ_NEXT(ia, ia_link)) {
+			TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) {
 				/*
 				 * If the addr to forward to is one
 				 * of ours, we pretend to