From owner-p4-projects@FreeBSD.ORG  Wed Aug  3 16:53:36 2005
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 B13C016A421; Wed,  3 Aug 2005 16:53:35 +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 8131116A41F
	for <perforce@freebsd.org>; Wed,  3 Aug 2005 16:53:35 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B9CB43D45
	for <perforce@freebsd.org>; Wed,  3 Aug 2005 16:53:35 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j73GrZqf005558
	for <perforce@freebsd.org>; Wed, 3 Aug 2005 16:53:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j73GrZjw005555
	for perforce@freebsd.org; Wed, 3 Aug 2005 16:53:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 3 Aug 2005 16:53:35 GMT
Message-Id: <200508031653.j73GrZjw005555@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81408 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, 03 Aug 2005 16:53:36 -0000

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

Change 81408 by rwatson@rwatson_zoo on 2005/08/03 16:52:45

	Remove stale comment about the caller needing to acquire the
	if_addr_mtx when walking address lists -- the in_multi macros
	now do this themselves.
	
	Remove stale comment to check whether we need to hold
	in_multi_mtx over the ip_mforward() path -- we don't, it would
	be a bad idea due to recursion.

Affected files ...

.. //depot/projects/netsmp/src/sys/netinet/in_var.h#7 edit
.. //depot/projects/netsmp/src/sys/netinet/ip_output.c#3 edit

Differences ...

==== //depot/projects/netsmp/src/sys/netinet/in_var.h#7 (text+ko) ====

@@ -188,8 +188,6 @@
 /*
  * Macro for looking up the in_multi record for a given IP multicast address
  * on a given interface.  If no matching record is found, "inm" is set null.
- *
- * Caller must hold IF_ADDR_LOCK().
  */
 #define IN_LOOKUP_MULTI(addr, ifp, inm) \
 	/* struct in_addr addr; */ \

==== //depot/projects/netsmp/src/sys/netinet/ip_output.c#3 (text+ko) ====

@@ -291,10 +291,6 @@
 				ip->ip_src = IA_SIN(ia)->sin_addr;
 		}
 
-		/*
-		 * XXXRW: Should the in_multi_mtx be held over
-		 * ip_mloopback() or ip_mforward()?
-		 */
 		IN_MULTI_LOCK();
 		IN_LOOKUP_MULTI(ip->ip_dst, ifp, inm);
 		if (inm != NULL &&