svn commit: r216557 - head/sys/dev/wpi

Bernhard Schmidt bschmidt at FreeBSD.org
Sun Dec 19 10:36:07 UTC 2010


Author: bschmidt
Date: Sun Dec 19 10:36:06 2010
New Revision: 216557
URL: http://svn.freebsd.org/changeset/base/216557

Log:
  Fix panic 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>
  MFC after:	3 days

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun Dec 19 09:18:14 2010	(r216556)
+++ head/sys/dev/wpi/if_wpi.c	Sun Dec 19 10:36:06 2010	(r216557)
@@ -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);


More information about the svn-src-all mailing list