PERFORCE change 144590 for review

[Julian Elischer]

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

Change 144590 by julian at julian_trafmon1 on 2008/07/04 00:33:26

	try merge in changes without destroying anything 

Affected files ...

.. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#5 integrate
.. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#6 integrate
.. //depot/projects/vimage-devel/src/sys/net/if_loop.c#4 integrate
.. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#4 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#4 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/ip6_ipsec.c#4 integrate
.. //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#3 integrate
.. //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#4 integrate
.. //depot/projects/vimage-devel/src/sys/sys/vimage.h#8 integrate

Differences ...

==== //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#5 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#4 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#5 (text+ko) ====

@@ -293,7 +293,7 @@
 	do {
 		INIT_VNET_NET(curvnet);
 
-		ifnet_byindex(ifp->if_index) = NULL;
+		ifnet_setbyindex(ifp->if_index, NULL);
 		/* XXX: should be locked with if_findindex() */
 		while (V_if_index > 0 && ifnet_byindex(V_if_index) == NULL)
 			V_if_index--;
@@ -319,7 +319,7 @@
 		V_if_index = ifp->if_index;
 	if (V_if_index >= V_if_indexlim)
 		if_grow();
-	ifnet_byindex(ifp->if_index) = ifp;
+	ifnet_setbyindex(ifp->if_index, ifp);
 
 	/* Rename the ifnet */
 	if (new_vnet == ifp->if_home_vnet) {

==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#6 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/net/if_loop.c#4 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.h#4 (text+ko) ====

@@ -40,18 +40,18 @@
 #ifdef VIMAGE
 void	syncache_destroy(void);
 #endif
-void	syncache_unreach(struct in_conninfo *, struct tcphdr *);
-int	syncache_expand(struct in_conninfo *, struct tcpopt *,
-	    struct tcphdr *, struct socket **, struct mbuf *);
-void	syncache_add(struct in_conninfo *, struct tcpopt *,
-	    struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *);
-void	syncache_offload_add(struct in_conninfo *, struct tcpopt *,
-	    struct tcphdr *, struct inpcb *, struct socket **,
-	    struct toe_usrreqs *tu, void *toepcb);
-void	syncache_chkrst(struct in_conninfo *, struct tcphdr *);
-void	syncache_badack(struct in_conninfo *);
-int	syncache_pcbcount(void);
-int	syncache_pcblist(struct sysctl_req *req, int max_pcbs,
+void	 syncache_unreach(struct in_conninfo *, struct tcphdr *);
+int	 syncache_expand(struct in_conninfo *, struct tcpopt *,
+	     struct tcphdr *, struct socket **, struct mbuf *);
+void	 syncache_add(struct in_conninfo *, struct tcpopt *,
+	     struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *);
+void	 syncache_offload_add(struct in_conninfo *, struct tcpopt *,
+             struct tcphdr *, struct inpcb *, struct socket **,
+             struct toe_usrreqs *tu, void *toepcb);
+void	 syncache_chkrst(struct in_conninfo *, struct tcphdr *);
+void	 syncache_badack(struct in_conninfo *);
+int	 syncache_pcbcount(void);
+int	 syncache_pcblist(struct sysctl_req *req, int max_pcbs,
 	    int *pcbs_exported);
 
 struct syncache {

==== //depot/projects/vimage-devel/src/sys/netinet6/in6_gif.c#3 (text+ko) ====

@@ -58,11 +58,11 @@
 #endif
 #include <netinet/ip_encap.h>
 #ifdef INET6
-#include <netinet6/vinet6.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/in6_gif.h>
 #include <netinet6/in6_var.h>
+#include <netinet6/vinet6.h>
 #endif
 #include <netinet6/ip6protosw.h>
 #include <netinet/ip_ecn.h>

==== //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#4 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/netinet6/ip6_ipsec.c#4 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/netinet6/vinet6.h#3 (text+ko) ====

@@ -32,14 +32,13 @@
 #define _NETINET6_VINET6_H_
 
 #include <netinet/ip6.h>
-#include <netinet/ip6.h>
-#include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/raw_ip6.h>
 #include <netinet/in_pcb.h>
 #include <netinet/icmp6.h>
 #include <netinet6/scope6_var.h>
 #include <netinet6/in6_ifattach.h>
+#include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
 
 #define INIT_VNET_INET6(vnet) \

==== //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#4 (text+ko) ====


==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#8 (text+ko) ====