MFC r205411:
Avoid holding the VLAN_LOCK() over the parent interface SIOCGIFMEDIA ioctl call, as it may sleep. Reviewed by: rwatson
This commit is contained in:
parent
550d4d3f51
commit
7bfcce64f2
@ -1335,9 +1335,9 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
||||
case SIOCGIFMEDIA:
|
||||
VLAN_LOCK();
|
||||
if (TRUNK(ifv) != NULL) {
|
||||
error = (*PARENT(ifv)->if_ioctl)(PARENT(ifv),
|
||||
SIOCGIFMEDIA, data);
|
||||
p = PARENT(ifv);
|
||||
VLAN_UNLOCK();
|
||||
error = (*p->if_ioctl)(p, SIOCGIFMEDIA, data);
|
||||
/* Limit the result to the parent's current config. */
|
||||
if (error == 0) {
|
||||
struct ifmediareq *ifmr;
|
||||
|
Loading…
x
Reference in New Issue
Block a user