Date: Mon, 27 Oct 2008 10:12:05 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 152006 for review Message-ID: <200810271012.m9RAC5C3078767@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152006 Change 152006 by zec@zec_tpx32 on 2008/10/27 10:11:10 Hopefully the last cosmetic / whitespace diff redux against head. Affected files ... .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#27 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#16 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#19 edit .. //depot/projects/vimage/src/sys/kern/kern_synch.c#25 edit .. //depot/projects/vimage/src/sys/net/if_bridge.c#22 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#19 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#30 edit .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#10 edit .. //depot/projects/vimage/src/sys/net/route.c#32 edit .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#14 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#40 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.h#10 edit .. //depot/projects/vimage/src/sys/rpc/rpc.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#27 (text+ko) ==== @@ -39,11 +39,11 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.125 2008/10/04 14:08:16 kib Exp $"); -#include "opt_compat.h" - #include <sys/param.h> #include <sys/queue.h> #include <sys/blist.h> ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#16 (text+ko) ==== @@ -26,11 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); -#include "opt_compat.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#19 (text+ko) ==== @@ -1294,7 +1294,7 @@ lookup.symvalue = (uintptr_t)symval.value; lookup.symsize = symval.size; error = copyout(&lookup, uap->data, - sizeof(lookup)); + sizeof(lookup)); break; } } ==== //depot/projects/vimage/src/sys/kern/kern_synch.c#25 (text+ko) ==== @@ -508,14 +508,12 @@ int i, nrun; struct loadavg *avg; - VPROCG_ITERLOOP_BEGIN(); nrun = sched_load(); avg = &averunnable; for (i = 0; i < 3; i++) avg->ldavg[i] = (cexp[i] * avg->ldavg[i] + nrun * FSCALE * (FSCALE - cexp[i])) >> FSHIFT; - VPROCG_ITERLOOP_END(); /* * Schedule the next update to occur after 5 seconds, but add a ==== //depot/projects/vimage/src/sys/net/if_bridge.c#22 (text+ko) ==== @@ -114,7 +114,6 @@ #include <netinet/in_systm.h> #include <netinet/in_var.h> #include <netinet/ip.h> -#include <netinet/ip_fw.h> #include <netinet/ip_var.h> #ifdef INET6 #include <netinet/ip6.h> ==== //depot/projects/vimage/src/sys/net/if_gif.c#19 (text+ko) ==== @@ -266,14 +266,17 @@ int type; void *data; { + switch (type) { case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); + #ifdef VIMAGE vnet_mod_register(&vnet_gif_modinfo); #else vnet_gif_iattach(NULL); #endif + break; case MOD_UNLOAD: if_clone_detach(&gif_cloner); @@ -281,7 +284,6 @@ vnet_mod_deregister(&vnet_gif_modinfo); #endif mtx_destroy(&gif_mtx); - break; default: return EOPNOTSUPP; ==== //depot/projects/vimage/src/sys/net/if_loop.c#30 (text+ko) ==== @@ -263,7 +263,7 @@ if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) { m_freem(m); return (rt->rt_flags & RTF_BLACKHOLE ? 0 : - rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH); + rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH); } ifp->if_opackets++; ==== //depot/projects/vimage/src/sys/net/raw_usrreq.c#10 (text+ko) ==== @@ -57,11 +57,9 @@ void raw_init(void) { -#ifndef VIMAGE INIT_VNET_NET(curvnet); LIST_INIT(&V_rawcb_list); -#endif } /* ==== //depot/projects/vimage/src/sys/net/route.c#32 (text+ko) ==== @@ -143,10 +143,10 @@ static int rtable_init(const void *unused) { + INIT_VNET_NET(curvnet); int table; + struct domain *dom; int fam; - struct domain *dom; - INIT_VNET_NET(curvnet); for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtattach) { @@ -225,7 +225,7 @@ #ifndef _SYS_SYSPROTO_H_ struct setfib_args { - int fibnum; + int fibnum; }; #endif int ==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#14 (text+ko) ==== @@ -1187,7 +1187,7 @@ #define ng_copy_meta(meta) NULL /* Hash related definitions */ -#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */ +#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ #define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#40 (text+ko) ==== @@ -88,8 +88,8 @@ static void ng_dumpitems(void); static void ng_dumpnodes(void); static void ng_dumphooks(void); + #endif /* NETGRAPH_DEBUG */ - /* * DEAD versions of the structures. * In order to avoid races, it is sometimes neccesary to point @@ -584,8 +584,7 @@ return (EINVAL); } - /* - * Locate the node type. If we fail we return. Do not try to load + /* Locate the node type. If we fail we return. Do not try to load * module. */ if ((type = ng_findtype(typename)) == NULL) ==== //depot/projects/vimage/src/sys/netinet6/nd6.h#10 (text+ko) ==== @@ -342,6 +342,8 @@ extern int nd6_debug; extern int nd6_onlink_ns_rfc4861; extern struct callout nd6_timer_ch; + +/* nd6_rtr.c */ extern int nd6_defifindex; extern int ip6_desync_factor; /* seconds */ extern u_int32_t ip6_temp_preferred_lifetime; /* seconds */ ==== //depot/projects/vimage/src/sys/rpc/rpc.h#4 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810271012.m9RAC5C3078767>