Page MenuHomeFreeBSD
Files F153084777

D5446.id13738.diff
No OneTemporary
Actions

D5446.id13738.diff
View Options

Index: sys/net80211/ieee80211_ioctl.c
===================================================================
--- sys/net80211/ieee80211_ioctl.c
+++ sys/net80211/ieee80211_ioctl.c
@@ -3291,7 +3291,7 @@
{
struct ieee80211vap *vap = ifp->if_softc;
struct ieee80211com *ic = vap->iv_ic;
- int error = 0;
+ int error = 0, wait = 0;
struct ifreq *ifr;
struct ifaddr *ifa; /* XXX */
@@ -3310,18 +3310,24 @@
* then it will automatically be brought up as a
* side-effect of bringing ourself up.
*/
- if (vap->iv_state == IEEE80211_S_INIT)
+ if (vap->iv_state == IEEE80211_S_INIT) {
+ if (ic->ic_nrunning == 0)
+ wait = 1;
ieee80211_start_locked(vap);
+ }
} else if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
/*
* Stop ourself. If we are the last vap to be
* marked down the parent will also be taken down.
*/
+ if (ic->ic_nrunning == 1)
+ wait = 1;
ieee80211_stop_locked(vap);
}
IEEE80211_UNLOCK(ic);
/* Wait for parent ioctl handler if it was queued */
- ieee80211_waitfor_parent(ic);
+ if (wait)
+ ieee80211_waitfor_parent(ic);
break;
case SIOCADDMULTI:
case SIOCDELMULTI:

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 1:03 AM (2 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31813162
Default Alt Text
D5446.id13738.diff (1 KB)

Event Timeline