1 files changed, 9 insertions, 9 deletions

diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index f8d591edebfb..f7d575be5bec 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -87,13 +87,13 @@ in_localaddr(in)
 	register struct in_ifaddr *ia;
 
 	if (subnetsarelocal) {
-		for (ia = in_ifaddrhead.tqh_first; ia; 
-		     ia = ia->ia_link.tqe_next)
+		for (ia = TAILQ_FIRST(&in_ifaddrhead); ia; 
+		     ia = TAILQ_NEXT(ia, ia_link))
 			if ((i & ia->ia_netmask) == ia->ia_net)
 				return (1);
 	} else {
-		for (ia = in_ifaddrhead.tqh_first; ia;
-		     ia = ia->ia_link.tqe_next)
+		for (ia = TAILQ_FIRST(&in_ifaddrhead); ia;
+		     ia = TAILQ_NEXT(ia, ia_link))
 			if ((i & ia->ia_subnetmask) == ia->ia_subnet)
 				return (1);
 	}
@@ -236,8 +236,8 @@ in_control(so, cmd, data, ifp, p)
 	 * the first one on the interface.
 	 */
 	if (ifp)
-		for (iap = in_ifaddrhead.tqh_first; iap; 
-		     iap = iap->ia_link.tqe_next)
+		for (iap = TAILQ_FIRST(&in_ifaddrhead); iap; 
+		     iap = TAILQ_NEXT(iap, ia_link))
 			if (iap->ia_ifp == ifp) {
 				if (((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr.s_addr ==
 				    iap->ia_addr.sin_addr.s_addr) {
@@ -257,7 +257,7 @@ in_control(so, cmd, data, ifp, p)
 		if (ifp == 0)
 			return (EADDRNOTAVAIL);
 		if (ifra->ifra_addr.sin_family == AF_INET) {
-			for (oia = ia; ia; ia = ia->ia_link.tqe_next) {
+			for (oia = ia; ia; ia = TAILQ_NEXT(ia, ia_link)) {
 				if (ia->ia_ifp == ifp  &&
 				    ia->ia_addr.sin_addr.s_addr ==
 				    ifra->ifra_addr.sin_addr.s_addr)
@@ -742,8 +742,8 @@ in_broadcast(in, ifp)
 	 * with a broadcast address.
 	 */
 #define ia ((struct in_ifaddr *)ifa)
-	for (ifa = ifp->if_addrhead.tqh_first; ifa; 
-	     ifa = ifa->ifa_link.tqe_next)
+	for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa; 
+	     ifa = TAILQ_NEXT(ifa, ifa_link))
 		if (ifa->ifa_addr->sa_family == AF_INET &&
 		    (in.s_addr == ia->ia_broadaddr.sin_addr.s_addr ||
 		     in.s_addr == ia->ia_netbroadcast.s_addr ||