svn commit: r191067 - user/thompsa/vaptq/sys/net80211

Andrew Thompson thompsa at FreeBSD.org
Tue Apr 14 11:18:16 PDT 2009


Author: thompsa
Date: Tue Apr 14 18:18:13 2009
New Revision: 191067
URL: http://svn.freebsd.org/changeset/base/191067

Log:
  Fix locking assertion.

Modified:
  user/thompsa/vaptq/sys/net80211/ieee80211_scan.c

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_scan.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_scan.c	Tue Apr 14 17:41:48 2009	(r191066)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_scan.c	Tue Apr 14 18:18:13 2009	(r191067)
@@ -809,12 +809,12 @@ scan_curchan(struct ieee80211_scan_state
 {
 	struct ieee80211vap *vap  = ss->ss_vap;
 
-	IEEE80211_LOCK_ASSERT(vap->iv_ic);
-
+	IEEE80211_LOCK(vap->iv_ic);
 	if (ss->ss_flags & IEEE80211_SCAN_ACTIVE)
 		ieee80211_probe_curchan(vap, 0);
 	callout_reset(&SCAN_PRIVATE(ss)->ss_scan_timer,
 	    maxdwell, scan_signal, ss);
+	IEEE80211_UNLOCK(vap->iv_ic);
 }
 
 static void


More information about the svn-src-user mailing list