From owner-p4-projects@FreeBSD.ORG  Sat Feb  4 09:03:49 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 94A0016A423; Sat,  4 Feb 2006 09:03:48 +0000 (GMT)
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 5A84516A420
	for <perforce@freebsd.org>; Sat,  4 Feb 2006 09:03:48 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3395143D45
	for <perforce@freebsd.org>; Sat,  4 Feb 2006 09:03:48 +0000 (GMT)
	(envelope-from imp@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 k1493l8j093405
	for <perforce@freebsd.org>; Sat, 4 Feb 2006 09:03:47 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1493lFu093402
	for perforce@freebsd.org; Sat, 4 Feb 2006 09:03:47 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 4 Feb 2006 09:03:47 GMT
Message-Id: <200602040903.k1493lFu093402@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91042 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: Sat, 04 Feb 2006 09:03:49 -0000

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

Change 91042 by imp@imp_plunger on 2006/02/04 09:02:46

	Fix spelling error
	Move locking to avoid nesting the locking and to give the locking a
	smaller scope.

Affected files ...

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

Differences ...

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

@@ -248,7 +248,7 @@
  * method.
  */
 static void
-ate_setmcaf(struct ate_softc *sc)
+ate_setmcast(struct ate_softc *sc)
 {
 	uint32_t index;
 	uint32_t mcaf[2];
@@ -267,8 +267,18 @@
 		af[index >> 3] |= 1 << (index & 7);
 	}
 	IF_ADDR_UNLOCK(sc->ifp);
+
+	/*
+	 * Write the hash to the hash register.  This card can also
+	 * accept unicast packets as well as multicast packets using this
+	 * register for easier bridging operations, but we don't take
+	 * 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
@@ -880,10 +890,8 @@
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		/* update multicast filter list. */
-		ATE_LOCK(sc);
 		ate_setmcast(sc);
 		error = 0;
-		ATE_UNLOCK(sc);
 		break;
 
 	default: