From owner-p4-projects@FreeBSD.ORG Fri Jul 4 00:33:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74A041065674; Fri, 4 Jul 2008 00:33:33 +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 35434106566C for ; Fri, 4 Jul 2008 00:33:33 +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 2602D8FC14 for ; Fri, 4 Jul 2008 00:33:33 +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 m640XXG9051636 for ; Fri, 4 Jul 2008 00:33:33 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m640XWx2051634 for perforce@freebsd.org; Fri, 4 Jul 2008 00:33:32 GMT (envelope-from julian@freebsd.org) Date: Fri, 4 Jul 2008 00:33:32 GMT Message-Id: <200807040033.m640XWx2051634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2008 00:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=144590 Change 144590 by julian@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 #ifdef INET6 -#include #include #include #include #include +#include #endif #include #include ==== //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 -#include -#include #include #include #include #include #include #include +#include #include #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) ====