svn commit: r200675 - stable/8/sys/dev/if_ndis

[John Baldwin]

Author: jhb
Date: Fri Dec 18 18:30:49 2009
New Revision: 200675
URL: http://svn.freebsd.org/changeset/base/200675

Log:
  MFC 200037:
  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.

Modified:
  stable/8/sys/dev/if_ndis/if_ndis.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- stable/8/sys/dev/if_ndis/if_ndis.c	Fri Dec 18 17:46:57 2009	(r200674)
+++ stable/8/sys/dev/if_ndis/if_ndis.c	Fri Dec 18 18:30:49 2009	(r200675)
@@ -3278,14 +3278,8 @@ ndis_newstate(struct ieee80211vap *vap, 
 static void
 ndis_scan(void *arg)
 {
-	struct ndis_softc *sc = arg;
-	struct ieee80211com *ic;
-	struct ieee80211vap *vap;
-
-	ic = sc->ifp->if_l2com;
-	vap = TAILQ_FIRST(&ic->ic_vaps);
+	struct ieee80211vap *vap = arg;
 
-	ndis_scan_results(sc);
 	ieee80211_scan_done(vap);
 }
 
@@ -3434,7 +3428,7 @@ ndis_scan_start(struct ieee80211com *ic)
 		return;
 	}
 	/* 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
@@ -3458,6 +3452,8 @@ ndis_scan_mindwell(struct ieee80211_scan
 static void
 ndis_scan_end(struct ieee80211com *ic)
 {
-	/* ignore */
+	struct ndis_softc *sc = ic->ic_ifp->if_softc;
+
+	ndis_scan_results(sc);
 }