system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-19 14:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ndis_scan_results() can sleep if the scan results are not ready when

Browse source 
ndis_scan() is called.  However, ndis_scan() is invoked from softclock()
and cannot sleep.  Move ndis_scan_results() to the ndis' driver's scan_end
hook instead.

Submitted by:	Paul B Mahol  onemda of gmail
MFC after:	1 week
This commit is contained in:
John Baldwin 2009-12-02 16:26:18 +00:00
parent 645275a641
commit 6b5ba0bba3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=200037
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/dev/if_ndis/if_ndis.c
View file

@ -3222,14 +3222,8 @@ ndis_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
static void static void
ndis_scan(void *arg) ndis_scan(void *arg)
{ {
struct ndis_softc *sc = arg; struct ieee80211vap *vap = arg;
struct ieee80211com *ic;
struct ieee80211vap *vap;
ic = sc->ifp->if_l2com;
vap = TAILQ_FIRST(&ic->ic_vaps);
ndis_scan_results(sc);
ieee80211_scan_done(vap); ieee80211_scan_done(vap);
} }
@ -3377,7 +3371,7 @@ ndis_scan_start(struct ieee80211com *ic)
return; return;
} }
/* Set a timer to collect the results */ /* Set a timer to collect the results */
callout_reset(&sc->ndis_scan_callout, hz * 3, ndis_scan, sc); callout_reset(&sc->ndis_scan_callout, hz * 3, ndis_scan, vap);
} }
static void static void
@ -3401,5 +3395,7 @@ ndis_scan_mindwell(struct ieee80211_scan_state *ss)
static void static void
ndis_scan_end(struct ieee80211com *ic) ndis_scan_end(struct ieee80211com *ic)
{ {
/* ignore */ struct ndis_softc *sc = ic->ic_ifp->if_softc;
ndis_scan_results(sc);
} }