svn commit: r197403 - head/sys/dev/if_ndis

[Coleman Kane]

Author: cokane
Date: Tue Sep 22 12:36:51 2009
New Revision: 197403
URL: http://svn.freebsd.org/changeset/base/197403

Log:
  The ndis_scan function may be started after ndis vap have been destroyed
  
  PR:		kern/138632
  Submitted by:	Paul B. Mahol <onemda at gmail.com>
  MFC after:	3 days

Modified:
  head/sys/dev/if_ndis/if_ndis.c

Modified: head/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis.c	Tue Sep 22 11:47:21 2009	(r197402)
+++ head/sys/dev/if_ndis/if_ndis.c	Tue Sep 22 12:36:51 2009	(r197403)
@@ -1012,7 +1012,12 @@ static void
 ndis_vap_delete(struct ieee80211vap *vap)
 {
 	struct ndis_vap *nvp = NDIS_VAP(vap);
+	struct ieee80211com *ic = vap->iv_ic;
+	struct ifnet *ifp = ic->ic_ifp;
+	struct ndis_softc *sc = ifp->if_softc;
 
+	ndis_stop(sc);
+	callout_drain(&sc->ndis_scan_callout);
 	ieee80211_vap_detach(vap);
 	free(nvp, M_80211_VAP);
 }