From owner-p4-projects@FreeBSD.ORG  Sat Nov 15 01:34:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 51E9D1065673; Sat, 15 Nov 2008 01:34:31 +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 16256106564A
	for <perforce@freebsd.org>; Sat, 15 Nov 2008 01:34:31 +0000 (UTC)
	(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E8EE78FC0C
	for <perforce@freebsd.org>; Sat, 15 Nov 2008 01:34:30 +0000 (UTC)
	(envelope-from qingli@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAF1YUM0042705
	for <perforce@freebsd.org>; Sat, 15 Nov 2008 01:34:30 GMT
	(envelope-from qingli@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAF1YUC3042703
	for perforce@freebsd.org; Sat, 15 Nov 2008 01:34:30 GMT
	(envelope-from qingli@freebsd.org)
Date: Sat, 15 Nov 2008 01:34:30 GMT
Message-Id: <200811150134.mAF1YUC3042703@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	qingli@freebsd.org using -f
From: Qing Li <qingli@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152984 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, 15 Nov 2008 01:34:31 -0000

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

Change 152984 by qingli@FreeBSD-newarp on 2008/11/15 01:34:16

	
	Incorporate the missing vnet macros there were missed
	from the last integrate.

Affected files ...

.. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#9 edit
.. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#6 edit

Differences ...

==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#9 (text+ko) ====

@@ -244,12 +244,9 @@
 	struct llentry *la = 0;
 	u_int flags;
 	int error;
-	int fibnum = -1;
-
 
 	*lle = NULL;
 
-
 	if (m) {
 		if (m->m_flags & M_BCAST) {
 			/* broadcast */

==== //depot/projects/arp-v2/src/sys/netinet6/nd6.c#6 (text+ko) ====

@@ -419,6 +419,10 @@
 
 	ln = (struct llentry *)arg;
 	ifp = ln->lle_tbl->llt_ifp;
+
+	CURVNET_SET(ifp->if_vnet);
+	INIT_VNET_INET6(curvnet);
+
 	IF_LLTBLS_LOCK(ifp);
 
 	if (ln->ln_ntick > 0) {
@@ -516,6 +520,7 @@
 		break;
 	}
 	IF_LLTBLS_UNLOCK(ifp);
+	CURVNET_RESTORE();
 }
 
 
@@ -721,6 +726,7 @@
 void
 nd6_purge(struct ifnet *ifp)
 {
+	INIT_VNET_INET6(ifp->if_vnet);
 	struct nd_defrouter *dr, *ndr;
 	struct nd_prefix *pr, *npr;
 
@@ -800,6 +806,7 @@
 struct llentry *
 nd6_lookup(struct in6_addr *addr6, int create, struct ifnet *ifp)
 {
+	INIT_VNET_INET6(curvnet);
 	struct sockaddr_in6 sin6;
 	struct llentry *ln;
 	int flags = 0;
@@ -928,6 +935,7 @@
 static struct llentry *
 nd6_free(struct llentry *ln, int gc)
 {
+	INIT_VNET_INET6(curvnet);
         struct llentry *next;
 	struct nd_defrouter *dr;
 	struct ifnet *ifp=NULL;
@@ -1033,6 +1041,7 @@
 void
 nd6_nud_hint(struct rtentry *rt, struct in6_addr *dst6, int force)
 {
+	INIT_VNET_INET6(curvnet);
 	struct llentry *ln;
 /*	struct ifnet *ifp = rt->rt_ifp;*/
 
@@ -1311,6 +1320,7 @@
 nd6_cache_lladdr(struct ifnet *ifp, struct in6_addr *from, char *lladdr,
     int lladdrlen, int type, int code)
 {
+	INIT_VNET_INET6(curvnet);
 	struct llentry *ln = NULL;
 	int is_newentry;
 	int do_update;