PERFORCE change 141615 for review
Julian Elischer
julian at FreeBSD.org
Thu May 15 00:39:56 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=141615
Change 141615 by julian at 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
More information about the p4-projects
mailing list