svn commit: r202611 - head/sys/net

[Andrew Thompson]

Author: thompsa
Date: Tue Jan 19 04:29:42 2010
New Revision: 202611
URL: http://svn.freebsd.org/changeset/base/202611

Log:
  Do not hold the lock over if_setlladdr() as it calls into the interface driver
  init routine.

Modified:
  head/sys/net/if_vlan.c

Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c	Tue Jan 19 01:33:56 2010	(r202610)
+++ head/sys/net/if_vlan.c	Tue Jan 19 04:29:42 2010	(r202611)
@@ -473,6 +473,9 @@ static void
 vlan_iflladdr(void *arg __unused, struct ifnet *ifp)
 {
 	struct ifvlan *ifv;
+#ifndef VLAN_ARRAY
+	struct ifvlan *next;
+#endif
 	int i;
 
 	/*
@@ -488,13 +491,15 @@ vlan_iflladdr(void *arg __unused, struct
 	 */
 #ifdef VLAN_ARRAY
 	for (i = 0; i < VLAN_ARRAY_SIZE; i++)
-		if ((ifv = ifp->if_vlantrunk->vlans[i]))
-			if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
+		if ((ifv = ifp->if_vlantrunk->vlans[i])) {
 #else /* VLAN_ARRAY */
 	for (i = 0; i < (1 << ifp->if_vlantrunk->hwidth); i++)
-		LIST_FOREACH(ifv, &ifp->if_vlantrunk->hash[i], ifv_list)
-			if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
+		LIST_FOREACH_SAFE(ifv, &ifp->if_vlantrunk->hash[i], ifv_list, next) {
 #endif /* VLAN_ARRAY */
+			VLAN_UNLOCK();
+			if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
+			VLAN_LOCK();
+		}
 	VLAN_UNLOCK();
 
 }