d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC 200037:

Browse Source 
ndis_scan_results() can sleep if the scan results are not ready when
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.
This commit is contained in:
jhb 2009-12-18 18:30:49 +00:00
parent c55271bb4d
commit bbe4674e14
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

@ -3278,14 +3278,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);
} }
@ -3434,7 +3428,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
@ -3458,6 +3452,8 @@ 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);
} }