From owner-svn-src-all@FreeBSD.ORG  Wed Jun 10 18:00:11 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20DD5106566B;
	Wed, 10 Jun 2009 18:00:11 +0000 (UTC)
	(envelope-from cokane@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C43B8FC15;
	Wed, 10 Jun 2009 18:00:11 +0000 (UTC)
	(envelope-from cokane@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AI0Asi021378;
	Wed, 10 Jun 2009 18:00:10 GMT (envelope-from cokane@svn.freebsd.org)
Received: (from cokane@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AI0AsJ021377;
	Wed, 10 Jun 2009 18:00:10 GMT (envelope-from cokane@svn.freebsd.org)
Message-Id: <200906101800.n5AI0AsJ021377@svn.freebsd.org>
From: Coleman Kane <cokane@FreeBSD.org>
Date: Wed, 10 Jun 2009 18:00:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193937 - head/sys/dev/if_ndis
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 18:00:11 -0000

Author: cokane
Date: Wed Jun 10 18:00:10 2009
New Revision: 193937
URL: http://svn.freebsd.org/changeset/base/193937

Log:
  Fix an LOR
  
  Submitted by:	Paul B. Mahol <onemda@gmail.com>
  MFC after:	1 week

Modified:
  head/sys/dev/if_ndis/if_ndis.c

Modified: head/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis.c	Wed Jun 10 17:41:24 2009	(r193936)
+++ head/sys/dev/if_ndis/if_ndis.c	Wed Jun 10 18:00:10 2009	(r193937)
@@ -3264,9 +3264,7 @@ ndis_scan(void *arg)
 	ic = sc->ifp->if_l2com;
 	vap = TAILQ_FIRST(&ic->ic_vaps);
 
-	NDIS_LOCK(sc);
 	ndis_scan_results(sc);
-	NDIS_UNLOCK(sc);
 	ieee80211_scan_done(vap);
 }
 
@@ -3403,10 +3401,8 @@ ndis_scan_start(struct ieee80211com *ic)
 	ss = ic->ic_scan;
 	vap = TAILQ_FIRST(&ic->ic_vaps);
 
-	NDIS_LOCK(sc);
 	if (!NDIS_INITIALIZED(sc)) {
 		DPRINTF(("%s: scan aborted\n", __func__));
-		NDIS_UNLOCK(sc);
 		ieee80211_cancel_scan(vap);
 		return;
 	}
@@ -3430,11 +3426,9 @@ ndis_scan_start(struct ieee80211com *ic)
 	    NULL, &len);
 	if (error) {
 		DPRINTF(("%s: scan command failed\n", __func__));
-		NDIS_UNLOCK(sc);
 		ieee80211_cancel_scan(vap);
 		return;
 	}
-	NDIS_UNLOCK(sc);
 	/* Set a timer to collect the results */
 	callout_reset(&sc->ndis_scan_callout, hz * 3, ndis_scan, sc);
 }