From owner-svn-src-stable@FreeBSD.ORG  Fri Mar 27 15:19:52 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84396106564A;
	Fri, 27 Mar 2009 15:19:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 717718FC1B;
	Fri, 27 Mar 2009 15:19:52 +0000 (UTC) (envelope-from jhb@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 n2RFJqR8064324;
	Fri, 27 Mar 2009 15:19:52 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2RFJqA4064323;
	Fri, 27 Mar 2009 15:19:52 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903271519.n2RFJqA4064323@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 27 Mar 2009 15:19:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190467 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/my
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Mar 2009 15:19:53 -0000

Author: jhb
Date: Fri Mar 27 15:19:51 2009
New Revision: 190467
URL: http://svn.freebsd.org/changeset/base/190467

Log:
  MFC: Release driver lock at the end of the watchdog routine instead of
  trying to acquire it again.
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/my/if_my.c

Modified: stable/7/sys/dev/my/if_my.c
==============================================================================
--- stable/7/sys/dev/my/if_my.c	Fri Mar 27 13:13:59 2009	(r190466)
+++ stable/7/sys/dev/my/if_my.c	Fri Mar 27 15:19:51 2009	(r190467)
@@ -1700,7 +1700,7 @@ my_watchdog(struct ifnet * ifp)
 	my_init_locked(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		my_start_locked(ifp);
-	MY_LOCK(sc);
+	MY_UNLOCK(sc);
 	return;
 }