From owner-p4-projects@FreeBSD.ORG  Mon Aug  8 23:50:34 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 9FEE916A41F; Mon,  8 Aug 2005 23:50:33 +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 3B3B416A41F
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 23:50:33 +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 AF5B843D46
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 23:50:32 +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 j78NoWJe062563
	for <perforce@freebsd.org>; Mon, 8 Aug 2005 23:50:32 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 j78NoWh5062560
	for perforce@freebsd.org; Mon, 8 Aug 2005 23:50:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 8 Aug 2005 23:50:32 GMT
Message-Id: <200508082350.j78NoWh5062560@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 81693 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: Mon, 08 Aug 2005 23:50:34 -0000

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

Change 81693 by rwatson@rwatson_peppercorn on 2005/08/08 23:49:40

	De-comment or de-XXX a few places for merge to CVS.

Affected files ...

.. //depot/projects/netsmp/src/sys/net/if_var.h#10 edit
.. //depot/projects/netsmp/src/sys/net/if_vlan.c#5 edit

Differences ...

==== //depot/projects/netsmp/src/sys/net/if_var.h#10 (text+ko) ====

@@ -423,8 +423,8 @@
 #define	IFQ_SET_MAXLEN(ifq, len)	((ifq)->ifq_maxlen = (len))
 
 /*
- * XXXRW: The IFF_DRV_OACTIVE test should really occur in the device driver,
- * not in the handoff logic, as that flag is locked by the device driver.
+ * The IFF_DRV_OACTIVE test should really occur in the device driver, not in
+ * the handoff logic, as that flag is locked by the device driver.
  */
 #define	IFQ_HANDOFF_ADJ(ifp, m, adj, err)				\
 do {									\

==== //depot/projects/netsmp/src/sys/net/if_vlan.c#5 (text+ko) ====

@@ -188,15 +188,6 @@
 	}
 
 	/* Now program new ones. */
-
-	/*
-	 * XXXRW: Really, this should happen in two steps, interlocked by the
-	 * vlan mutex (if any: first, the parent interface's address list
-	 * should be propagated to the softc, then from the softc to the
-	 * child, in order to avoid holding parent's and child's if_addr_mtx
-	 * at the same time.  Races can occur, but won't result in
-	 * incorrectness.  Assuming there is a vlan mutex.
-	 */
 	IF_ADDR_LOCK(ifp);
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)