diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-23 13:39:56 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-23 13:39:56 -0500 |
| commit | f448388bb29525075f374464ec8c4c04e9bf03f6 (patch) | |
| tree | b51e7d59eebc90d5c3d9578d1a98bb2e58265dfd /sys/net80211/ieee80211_ioctl.c | |
| parent | 57a447a9c3cb69fb2e4f874104327cdc3203313a (diff) | |
| parent | 62dc16af9990c7ed2d0ad80da282ec71427e8556 (diff) | |
| download | FreeBSD-src-f448388bb29525075f374464ec8c4c04e9bf03f6.zip FreeBSD-src-f448388bb29525075f374464ec8c4c04e9bf03f6.tar.gz | |
Merge remote-tracking branch 'origin/master' into devel-11
Diffstat (limited to 'sys/net80211/ieee80211_ioctl.c')
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 3d93278..b65f23a 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2486,6 +2486,11 @@ ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr) * Otherwise just invoke the scan machinery directly. */ IEEE80211_LOCK(ic); + if (ic->ic_nrunning == 0) { + IEEE80211_UNLOCK(ic); + return ENXIO; + } + if (vap->iv_state == IEEE80211_S_INIT) { /* NB: clobbers previous settings */ vap->iv_scanreq_flags = sr->sr_flags; |
