From owner-svn-src-user@FreeBSD.ORG  Sun May 31 05:37:16 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 688C2106566C;
	Sun, 31 May 2009 05:37:16 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 57A068FC16;
	Sun, 31 May 2009 05:37:16 +0000 (UTC)
	(envelope-from kmacy@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 n4V5bG1A030578;
	Sun, 31 May 2009 05:37:16 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4V5bGxS030577;
	Sun, 31 May 2009 05:37:16 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905310537.n4V5bGxS030577@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 31 May 2009 05:37:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193148 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 May 2009 05:37:16 -0000

Author: kmacy
Date: Sun May 31 05:37:15 2009
New Revision: 193148
URL: http://svn.freebsd.org/changeset/base/193148

Log:
  drop lock before calling drain

Modified:
  user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c

Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Sun May 31 05:20:54 2009	(r193147)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c	Sun May 31 05:37:15 2009	(r193148)
@@ -1782,19 +1782,19 @@ cxgb_down_locked(struct adapter *sc)
 	
 	callout_stop(&sc->cxgb_tick_ch);
 	callout_stop(&sc->sge_timer_ch);
+	ADAPTER_UNLOCK(sc);
+
 	callout_drain(&sc->cxgb_tick_ch);
 	callout_drain(&sc->sge_timer_ch);
 	
 	if (sc->tq != NULL) {
 		printf("draining slow intr\n");
-		
 		taskqueue_drain(sc->tq, &sc->slow_intr_task);
 			printf("draining ext intr\n");	
 		taskqueue_drain(sc->tq, &sc->ext_intr_task);
 		printf("draining tick task\n");
 		taskqueue_drain(sc->tq, &sc->tick_task);
 	}
-	ADAPTER_UNLOCK(sc);
 }
 
 static int