summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_ioctl.c
diff options
context:
space:
mode:
authoronoe <onoe@FreeBSD.org>2004-01-19 05:25:43 +0000
committeronoe <onoe@FreeBSD.org>2004-01-19 05:25:43 +0000
commit8fb32b257351c76898deb725a266d5dfb7ba1c14 (patch)
tree4fc8e05a2a288409d9f4a243b2160feafec747c9 /sys/net80211/ieee80211_ioctl.c
parentb735e2a8eec550cdf22b78f8373dab8463416b65 (diff)
downloadFreeBSD-src-8fb32b257351c76898deb725a266d5dfb7ba1c14.zip
FreeBSD-src-8fb32b257351c76898deb725a266d5dfb7ba1c14.tar.gz
Change WI_RID_SCAN_RES compatibility interface to return the result after
active scan is completed just as WI_RID_READ_APS. This fixes wicontrol -L for ath(4) and awi(4) to have results even if the driver cannot associate any APs.
Diffstat (limited to 'sys/net80211/ieee80211_ioctl.c')
-rw-r--r--sys/net80211/ieee80211_ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 1c7df74..ecd3d3b 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -301,7 +301,8 @@ ieee80211_cfgget(struct ifnet *ifp, u_long cmd, caddr_t data)
break;
case WI_RID_SCAN_RES: /* compatibility interface */
if (ic->ic_opmode != IEEE80211_M_HOSTAP &&
- ic->ic_state == IEEE80211_S_SCAN) {
+ ic->ic_state == IEEE80211_S_SCAN &&
+ (ic->ic_flags & IEEE80211_F_ASCAN)) {
error = EINPROGRESS;
break;
}
OpenPOWER on IntegriCloud