From owner-svn-src-head@FreeBSD.ORG Mon Jun 1 16:29:04 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A5D7106564A; Mon, 1 Jun 2009 16:29:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 391878FC08; Mon, 1 Jun 2009 16:29:04 +0000 (UTC) (envelope-from imp@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 n51GT4jV084393; Mon, 1 Jun 2009 16:29:04 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51GT4ck084392; Mon, 1 Jun 2009 16:29:04 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200906011629.n51GT4ck084392@svn.freebsd.org> From: Warner Losh Date: Mon, 1 Jun 2009 16:29:04 +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: r193238 - head/sys/dev/bwi X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 16:29:04 -0000 Author: imp Date: Mon Jun 1 16:29:03 2009 New Revision: 193238 URL: http://svn.freebsd.org/changeset/base/193238 Log: Move the unlock to after the ifdef (maybe the right fix is to remove the ifdef) since it calls bwi_start_locked, which expects to the lock to be held... Modified: head/sys/dev/bwi/if_bwi.c Modified: head/sys/dev/bwi/if_bwi.c ============================================================================== --- head/sys/dev/bwi/if_bwi.c Mon Jun 1 16:27:13 2009 (r193237) +++ head/sys/dev/bwi/if_bwi.c Mon Jun 1 16:29:03 2009 (r193238) @@ -4069,8 +4069,8 @@ bwi_restart(void *xsc, int pending) if_printf(ifp, "%s begin, help!\n", __func__); BWI_LOCK(sc); bwi_init_statechg(xsc, 0); - BWI_UNLOCK(sc); #if 0 bwi_start_locked(ifp); #endif + BWI_UNLOCK(sc); }