From owner-p4-projects@FreeBSD.ORG  Thu May 15 00:39:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C28C1065678; Thu, 15 May 2008 00:39:56 +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 D02331065671
	for <perforce@freebsd.org>; Thu, 15 May 2008 00:39:55 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C4CAA8FC0A
	for <perforce@freebsd.org>; Thu, 15 May 2008 00:39:55 +0000 (UTC)
	(envelope-from julian@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 m4F0dtHo068790
	for <perforce@freebsd.org>; Thu, 15 May 2008 00:39:55 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4F0dtJP068786
	for perforce@freebsd.org; Thu, 15 May 2008 00:39:55 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 15 May 2008 00:39:55 GMT
Message-Id: <200805150039.m4F0dtJP068786@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141615 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: Thu, 15 May 2008 00:39:56 -0000

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

Change 141615 by julian@julian_trafmon1 on 2008/05/15 00:39:17

	Fix some thing sto make it compile a bit further

Affected files ...

.. //depot/projects/vimage/src/sys/net/route.c#15 edit
.. //depot/projects/vimage/src/sys/net/vnet.h#9 edit
.. //depot/projects/vimage/src/sys/netinet/in_proto.c#13 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/route.c#15 (text+ko) ====

@@ -220,6 +220,7 @@
 struct setfib_args {
 	int     fibnum;
 };
+#endif
 int
 setfib(struct thread *td, struct setfib_args *uap)
 {

==== //depot/projects/vimage/src/sys/net/vnet.h#9 (text+ko) ====

@@ -35,6 +35,8 @@
 
 
 #ifdef VIMAGE
+#include "opt_route.h"
+
 #include <sys/proc.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
@@ -44,6 +46,14 @@
 #include <net/route.h>
 #include <net/raw_cb.h>
 
+
+/* calculate this the same as in route.c */
+#ifndef ROUTETABLES
+ #define RT_MAXFIBS 1
+#else
+ #define RT_MAXFIBS 16
+#endif
+
 struct vnet_net {
 	int	_if_index;
 	struct	ifindex_entry *_ifindex_table;
@@ -54,7 +64,7 @@
 	struct	knlist _ifklist;
 
 	struct	rtstat _rtstat;
-	struct	radix_node_head *_rt_tables[RT_MAXFIB][AF_MAX+1];
+	struct	radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1];
 	int	_rttrash;
 
 	struct	ifnet *_loif;

==== //depot/projects/vimage/src/sys/netinet/in_proto.c#13 (text+ko) ====

@@ -371,6 +371,7 @@
 	.dom_rtattach =		rn4_mpath_inithead,
 #else
 	.dom_rtattach =		in_inithead,
+#endif
 #ifdef VIMAGE
 	.dom_rtdetach =		in_detachhead,
 #endif