aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSam Leffler <sam@FreeBSD.org>2009-08-12 21:19:19 +0000
committerSam Leffler <sam@FreeBSD.org>2009-08-12 21:19:19 +0000
commitab501dd65ddd51857f3f0db42e1b4854eaf164e2 (patch)
treebe8f003dafff32e26fd7676380173bfb06766acd /sys
parent692eebe092e81927e190dd5eeb4f65d2324ea3fa (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 081c6db3b1c0..b14f13f90fe1 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -573,11 +573,13 @@ ieee80211_vap_detach(struct ieee80211vap *vap)
/*
* Flush any deferred vap tasks.
- * NB: must be before ether_ifdetach() and removal from ic_vaps list
*/
ieee80211_draintask(ic, &vap->iv_nstate_task);
ieee80211_draintask(ic, &vap->iv_swbmiss_task);
+ /* XXX band-aid until ifnet handles this for us */
+ taskqueue_drain(taskqueue_swi, &ifp->if_linktask);
+
IEEE80211_LOCK(ic);
KASSERT(vap->iv_state == IEEE80211_S_INIT , ("vap still running"));
TAILQ_REMOVE(&ic->ic_vaps, vap, iv_next);