From owner-p4-projects@FreeBSD.ORG  Wed Jul 28 21:58:19 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 34DE11065678; Wed, 28 Jul 2010 21:58:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED6501065674
	for <perforce@freebsd.org>; Wed, 28 Jul 2010 21:58:18 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DAD8D8FC1D
	for <perforce@freebsd.org>; Wed, 28 Jul 2010 21:58:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SLwI05041796
	for <perforce@freebsd.org>; Wed, 28 Jul 2010 21:58:18 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SLwIgB041794
	for perforce@freebsd.org; Wed, 28 Jul 2010 21:58:18 GMT
	(envelope-from bz@freebsd.org)
Date: Wed, 28 Jul 2010 21:58:18 GMT
Message-Id: <201007282158.o6SLwIgB041794@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181537 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 28 Jul 2010 21:58:19 -0000

http://p4web.freebsd.org/@@181537?ac=10

Change 181537 by bz@bz_dumpster on 2010/07/28 21:57:43

	Move a standalone comment further up to SeND related code and adjust
	the wording.
	
	Reviewed by:	anchie

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#38 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#38 (text+ko) ====

@@ -1947,7 +1947,13 @@
 	mac_netinet6_nd6_send(ifp, m);
 #endif
 
-	/* Send outgoing NS/NA/REDIRECT packet to sendd. */
+	/*
+	 * If called from nd6_ns_output() (NS), nd6_na_output() (NA),
+	 * icmp6_redirect_output() (REDIRECT) or from rip6_output() (RS, RA
+	 * as handled by rtsol and rtadvd), mbufs will be tagged for SeND
+	 * to be diverted to user space.  When re-injected into the kernel,
+	 * send_output() will directly dispatch them to the outgoing interface.
+	 */
 	if (send_sendso_input_hook != NULL) {
 		mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL);
 		if (mtag != NULL) {
@@ -1985,16 +1991,6 @@
 		return (error);
 	}
 
-	/*
-	 * In case of NS, NA and Redirect, we end-up here after calling
-	 * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output().
-	 * RS and RA do not have such output routines. They are handled
-	 * instead by rtadvd and rtsol daemons.
-	 *
-	 * if_output() routines together with previous chaining will be called
-	 * from input hook.
-	 */
-
 	if ((ifp->if_flags & IFF_LOOPBACK) != 0) {
 		return ((*ifp->if_output)(origifp, m, (struct sockaddr *)dst,
 		    NULL));