summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_proto.c
diff options
context:
space:
mode:
authorthompsa <thompsa@FreeBSD.org>2009-05-10 02:21:19 +0000
committerthompsa <thompsa@FreeBSD.org>2009-05-10 02:21:19 +0000
commitaae9005ac300568382cff11869223c881b3d0241 (patch)
tree298e0ed65ead990d1f6ae984591932595384cfca /sys/net80211/ieee80211_proto.c
parent9913dad78324dd8bc8da927e4b1d87003ecfe7d9 (diff)
downloadFreeBSD-src-aae9005ac300568382cff11869223c881b3d0241.zip
FreeBSD-src-aae9005ac300568382cff11869223c881b3d0241.tar.gz
Cancel the scan when going to INIT state. Should do this for other states here
too as once the protocol newstate handler runs the scan has always ended.
Diffstat (limited to 'sys/net80211/ieee80211_proto.c')
-rw-r--r--sys/net80211/ieee80211_proto.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 157dc5b..467a362 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1834,6 +1834,8 @@ ieee80211_new_state_locked(struct ieee80211vap *vap,
}
break;
case IEEE80211_S_INIT:
+ /* cancel any scan in progress */
+ ieee80211_cancel_scan(vap);
if (ostate == IEEE80211_S_INIT ) {
/* XXX don't believe this */
/* INIT -> INIT. nothing to do */
OpenPOWER on IntegriCloud