d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not hold the lock over if_setlladdr() as it calls into the interface driver

Browse Source 
init routine.
This commit is contained in:
Andrew Thompson 2010-01-19 04:29:42 +00:00
parent cc5abe58ce
commit 6117727b6c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/net/if_vlan.c
View File

@ -473,6 +473,9 @@ static void
vlan_iflladdr(void *arg __unused, struct ifnet *ifp) vlan_iflladdr(void *arg __unused, struct ifnet *ifp)
{ {
struct ifvlan *ifv; struct ifvlan *ifv;
#ifndef VLAN_ARRAY
struct ifvlan *next;
#endif
int i; int i;
/* /*
@ -488,13 +491,15 @@ vlan_iflladdr(void *arg __unused, struct ifnet *ifp)
*/ */
#ifdef VLAN_ARRAY #ifdef VLAN_ARRAY
for (i = 0; i < VLAN_ARRAY_SIZE; i++) for (i = 0; i < VLAN_ARRAY_SIZE; i++)
if ((ifv = ifp->if_vlantrunk->vlans[i])) if ((ifv = ifp->if_vlantrunk->vlans[i])) {
if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
#else /* VLAN_ARRAY */ #else /* VLAN_ARRAY */
for (i = 0; i < (1 << ifp->if_vlantrunk->hwidth); i++) for (i = 0; i < (1 << ifp->if_vlantrunk->hwidth); i++)
LIST_FOREACH(ifv, &ifp->if_vlantrunk->hash[i], ifv_list) LIST_FOREACH_SAFE(ifv, &ifp->if_vlantrunk->hash[i], ifv_list, next) {
if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
#endif /* VLAN_ARRAY */ #endif /* VLAN_ARRAY */
VLAN_UNLOCK();
if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
VLAN_LOCK();
}
VLAN_UNLOCK(); VLAN_UNLOCK();
} }