From owner-p4-projects@FreeBSD.ORG  Wed Mar 22 20:53:38 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3DE3A16A424; Wed, 22 Mar 2006 20:53:38 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1D1BC16A422
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 20:53:38 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A70E243D4C
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 20:53:37 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MKrbqe097397
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 20:53:37 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MKrbkK097394
	for perforce@freebsd.org; Wed, 22 Mar 2006 20:53:37 GMT
	(envelope-from cognet@freebsd.org)
Date: Wed, 22 Mar 2006 20:53:37 GMT
Message-Id: <200603222053.k2MKrbkK097394@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93810 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Mar 2006 20:53:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=93810

Change 93810 by cognet@cognet on 2006/03/22 20:53:19

	Change locking so that ate_setmcast() has to be called with the 
	ATE_LOCK. Doing the lock inside ate_setmcast would lead to lock
	recursion, because ifinit_locked() calls it.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#46 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#46 (text+ko) ====

@@ -300,10 +300,8 @@
 	 * advantage of that.  Locks here are to avoid LOR with the
 	 * IF_ADDR_LOCK, but might not be strictly necessary.
 	 */
-	ATE_LOCK(sc);
 	WR4(sc, ETH_HSL, mcaf[0]);
 	WR4(sc, ETH_HSH, mcaf[1]);
-	ATE_UNLOCK(sc);
 }
 
 static int
@@ -902,7 +900,9 @@
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		/* update multicast filter list. */
+		ATE_LOCK(sc);
 		ate_setmcast(sc);
+		ATE_UNLOCK(sc);
 		error = 0;
 		break;