svn commit: r216709 - stable/8/sys/dev/wpi

[Bernhard Schmidt]

Author: bschmidt
Date: Sun Dec 26 14:09:06 2010
New Revision: 216709
URL: http://svn.freebsd.org/changeset/base/216709

Log:
  MFC r216557:
  Fix panic while trying to use monitor mode. The iwn_cmd() calls issued by
  iwn_config() want to msleep() on the mutex.
  
  PR:		kern/138427
  Submitted by:	Henry Hu <henry.hu.sh at gmail.com>
  Approved by:	re (kib)

Modified:
  stable/8/sys/dev/wpi/if_wpi.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)

Modified: stable/8/sys/dev/wpi/if_wpi.c
==============================================================================
--- stable/8/sys/dev/wpi/if_wpi.c	Sun Dec 26 13:57:05 2010	(r216708)
+++ stable/8/sys/dev/wpi/if_wpi.c	Sun Dec 26 14:09:06 2010	(r216709)
@@ -3561,7 +3561,9 @@ wpi_set_channel(struct ieee80211com *ic)
 	 * are already taken care of by their respective firmware commands.
 	 */
 	if (ic->ic_opmode == IEEE80211_M_MONITOR) {
+		WPI_LOCK(sc);
 		error = wpi_config(sc);
+		WPI_UNLOCK(sc);
 		if (error != 0)
 			device_printf(sc->sc_dev,
 			    "error %d settting channel\n", error);