From owner-p4-projects@FreeBSD.ORG  Wed Aug  1 11:59:50 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9E6416A468; Wed,  1 Aug 2007 11:59:50 +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 89BC216A419
	for <perforce@FreeBSD.org>; Wed,  1 Aug 2007 11:59:50 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B4D813C458
	for <perforce@FreeBSD.org>; Wed,  1 Aug 2007 11:59:50 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l71Bxo3p099165
	for <perforce@FreeBSD.org>; Wed, 1 Aug 2007 11:59:50 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l71Bxo7q099162
	for perforce@freebsd.org; Wed, 1 Aug 2007 11:59:50 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 1 Aug 2007 11:59:50 GMT
Message-Id: <200708011159.l71Bxo7q099162@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124457 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, 01 Aug 2007 11:59:51 -0000

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

Change 124457 by zec@zec_tpx32 on 2007/08/01 11:59:16

	Make ng_gif compatible with options VIMAGE kernels.

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/ng_gif.c#2 (text+ko) ====

@@ -69,6 +69,8 @@
  * ng_gif(4) netgraph node type
  */
 
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -77,7 +79,9 @@
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
+#include <sys/vimage.h>
 
+#include <net/vnet.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_types.h>
@@ -560,10 +564,13 @@
 
 		/* Create nodes for any already-existing gif interfaces */
 		IFNET_RLOCK();
-		TAILQ_FOREACH(ifp, &ifnet, if_link) {
+		VNET_ITERLOOP_BEGIN_QUIET();
+		INIT_VNET_NET(curvnet);
+		TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
 			if (ifp->if_type == IFT_GIF)
 				ng_gif_attach(ifp);
 		}
+		VNET_ITERLOOP_END();
 		IFNET_RUNLOCK();
 		break;