summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2010-01-19 04:29:42 +0000
committerthompsa <thompsa@FreeBSD.org>2010-01-19 04:29:42 +0000
commitd0093d69aa47b2e5b4ca7be5feb402876e1bc9f2 (patch)
treeb287567f4fbfe67f40621b2f3b9bfcb8c1f80cba /sys
parent3a511bb38a3c475bd840a430794a4149bbccda29 (diff)
downloadFreeBSD-src-d0093d69aa47b2e5b4ca7be5feb402876e1bc9f2.zip
FreeBSD-src-d0093d69aa47b2e5b4ca7be5feb402876e1bc9f2.tar.gz
Do not hold the lock over if_setlladdr() as it calls into the interface driver
init routine.
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_vlan.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 84edf1b..4b16a9c 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -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 ifnet *ifp)
*/
#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();
}
OpenPOWER on IntegriCloud