svn commit: r191335 - head/sys/net

[Robert Watson]

Author: rwatson
Date: Mon Apr 20 20:09:55 2009
New Revision: 191335
URL: http://svn.freebsd.org/changeset/base/191335

Log:
  Prefer if_addrhead (FreeBSD) to if_addrlist (BSD compat) naming for the
  interface address list in if_stf.c.
  
  Acquire interface address list locks around address list access.
  
  MFC after:	2 months

Modified:
  head/sys/net/if_stf.c

Modified: head/sys/net/if_stf.c
==============================================================================
--- head/sys/net/if_stf.c	Mon Apr 20 19:53:26 2009	(r191334)
+++ head/sys/net/if_stf.c	Mon Apr 20 20:09:55 2009	(r191335)
@@ -382,7 +382,8 @@ stf_getsrcifa6(ifp)
 	struct sockaddr_in6 *sin6;
 	struct in_addr in;
 
-	TAILQ_FOREACH(ia, &ifp->if_addrlist, ifa_list) {
+	IF_ADDR_LOCK(ifp);
+	TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_list) {
 		if (ia->ifa_addr->sa_family != AF_INET6)
 			continue;
 		sin6 = (struct sockaddr_in6 *)ia->ifa_addr;
@@ -396,8 +397,10 @@ stf_getsrcifa6(ifp)
 		if (ia4 == NULL)
 			continue;
 
+		IF_ADDR_UNLOCK(ifp);
 		return (struct in6_ifaddr *)ia;
 	}
+	IF_ADDR_UNLOCK(ifp);
 
 	return NULL;
 }