Date: Sun, 21 Sep 2008 17:53:39 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 150219 for review Message-ID: <200809211753.m8LHrd5D025948@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150219 Change 150219 by bz@bz_dumpster on 2008/09/21 17:52:50 Bascially only whitespace/style changes as well as moving a few IINIT_VNET_INET which are not at the very top to below the variable they reference. Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#3 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#21 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#3 (text+ko) ==== @@ -1858,9 +1858,9 @@ /* * Symbol translation macros */ -#define INIT_VNET_PF(vnet) \ +#define INIT_VNET_PF(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_PF, struct vnet_pf, vnet_pf) -#define VNET_PF(sym) VSYM(vnet_pf, sym) +#define VNET_PF(sym) VSYM(vnet_pf, sym) #endif /* _NET_PFVAR_H_ */ ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.h#3 (text+ko) ==== @@ -114,10 +114,10 @@ * Virtualization support */ -#define INIT_VNET_GIF(vnet) \ +#define INIT_VNET_GIF(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) -#define VNET_GIF(sym) VSYM(vnet_gif, sym) +#define VNET_GIF(sym) VSYM(vnet_gif, sym) struct vnet_gif { LIST_HEAD(, gif_softc) _gif_softc_list; @@ -127,11 +127,11 @@ int _ip6_gif_hlim; }; -#define V_gif_softc_list VNET_GIF(gif_softc_list) -#define V_max_gif_nesting VNET_GIF(max_gif_nesting) -#define V_parallel_tunnels VNET_GIF(parallel_tunnels) -#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) -#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) +#define V_gif_softc_list VNET_GIF(gif_softc_list) +#define V_max_gif_nesting VNET_GIF(max_gif_nesting) +#define V_parallel_tunnels VNET_GIF(parallel_tunnels) +#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) +#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) #endif /* _KERNEL */ ==== //depot/projects/vimage-commit2/src/sys/net/route.c#13 (text+ko) ==== @@ -257,8 +257,8 @@ rtalloc1_fib(struct sockaddr *dst, int report, u_long ignflags, u_int fibnum) { + INIT_VNET_NET(curvnet); struct radix_node_head *rnh; - INIT_VNET_NET(curvnet); struct rtentry *rt; struct radix_node *rn; struct rtentry *newrt; ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#8 (text+ko) ==== @@ -1184,22 +1184,22 @@ #define ng_copy_meta(meta) NULL /* Hash related definitions */ -#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ +#define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ -#define INIT_VNET_NETGRAPH(vnet) \ +#define INIT_VNET_NETGRAPH(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_NETGRAPH, \ struct vnet_netgraph, vnet_netgraph) -#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) +#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) /* Symbol translation macros */ -#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) -#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) -#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) -#define V_nextID VNET_NETGRAPH(nextID) -#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) -#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) -#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) +#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) +#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) +#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) +#define V_nextID VNET_NETGRAPH(nextID) +#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) +#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) +#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) #endif /* _NETGRAPH_NETGRAPH_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#8 (text+ko) ==== @@ -716,40 +716,40 @@ /* * Symbol translation macros */ -#define INIT_VNET_IPFW(vnet) \ +#define INIT_VNET_IPFW(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_IPFW, struct vnet_ipfw, vnet_ipfw) -#define VNET_IPFW(sym) VSYM(vnet_ipfw, sym) +#define VNET_IPFW(sym) VSYM(vnet_ipfw, sym) -#define V_fw_one_pass VNET_IPFW(fw_one_pass) -#define V_fw_enable VNET_IPFW(fw_enable) -#define V_fw6_enable VNET_IPFW(fw6_enable) -#define V_set_disable VNET_IPFW(set_disable) -#define V_fw_deny_unknown_exthdrs VNET_IPFW(fw_deny_unknown_exthdrs) -#define V_fw_verbose VNET_IPFW(fw_verbose) -#define V_verbose_limit VNET_IPFW(verbose_limit) -#define V_fw_debug VNET_IPFW(fw_debug) -#define V_autoinc_step VNET_IPFW(autoinc_step) -#define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) -#define V_layer3_chain VNET_IPFW(layer3_chain) -#define V_dyn_buckets VNET_IPFW(dyn_buckets) -#define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) -#define V_dyn_ack_lifetime VNET_IPFW(dyn_ack_lifetime) -#define V_dyn_syn_lifetime VNET_IPFW(dyn_syn_lifetime) -#define V_dyn_fin_lifetime VNET_IPFW(dyn_fin_lifetime) -#define V_dyn_rst_lifetime VNET_IPFW(dyn_rst_lifetime) -#define V_dyn_udp_lifetime VNET_IPFW(dyn_udp_lifetime) -#define V_dyn_short_lifetime VNET_IPFW(dyn_short_lifetime) -#define V_dyn_keepalive_interval VNET_IPFW(dyn_keepalive_interval) -#define V_dyn_keepalive_period VNET_IPFW(dyn_keepalive_period) -#define V_dyn_keepalive VNET_IPFW(dyn_keepalive) -#define V_static_count VNET_IPFW(static_count) -#define V_static_len VNET_IPFW(static_len) -#define V_dyn_count VNET_IPFW(dyn_count) -#define V_dyn_max VNET_IPFW(dyn_max) -#define V_norule_counter VNET_IPFW(norule_counter) -#define V_ipfw_timeout VNET_IPFW(ipfw_timeout) -#define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) +#define V_fw_one_pass VNET_IPFW(fw_one_pass) +#define V_fw_enable VNET_IPFW(fw_enable) +#define V_fw6_enable VNET_IPFW(fw6_enable) +#define V_set_disable VNET_IPFW(set_disable) +#define V_fw_deny_unknown_exthdrs VNET_IPFW(fw_deny_unknown_exthdrs) +#define V_fw_verbose VNET_IPFW(fw_verbose) +#define V_verbose_limit VNET_IPFW(verbose_limit) +#define V_fw_debug VNET_IPFW(fw_debug) +#define V_autoinc_step VNET_IPFW(autoinc_step) +#define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) +#define V_layer3_chain VNET_IPFW(layer3_chain) +#define V_dyn_buckets VNET_IPFW(dyn_buckets) +#define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) +#define V_dyn_ack_lifetime VNET_IPFW(dyn_ack_lifetime) +#define V_dyn_syn_lifetime VNET_IPFW(dyn_syn_lifetime) +#define V_dyn_fin_lifetime VNET_IPFW(dyn_fin_lifetime) +#define V_dyn_rst_lifetime VNET_IPFW(dyn_rst_lifetime) +#define V_dyn_udp_lifetime VNET_IPFW(dyn_udp_lifetime) +#define V_dyn_short_lifetime VNET_IPFW(dyn_short_lifetime) +#define V_dyn_keepalive_interval VNET_IPFW(dyn_keepalive_interval) +#define V_dyn_keepalive_period VNET_IPFW(dyn_keepalive_period) +#define V_dyn_keepalive VNET_IPFW(dyn_keepalive) +#define V_static_count VNET_IPFW(static_count) +#define V_static_len VNET_IPFW(static_len) +#define V_dyn_count VNET_IPFW(dyn_count) +#define V_dyn_max VNET_IPFW(dyn_max) +#define V_norule_counter VNET_IPFW(norule_counter) +#define V_ipfw_timeout VNET_IPFW(ipfw_timeout) +#define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#21 (text+ko) ==== @@ -4174,8 +4174,8 @@ static int ipfw_ctl(struct sockopt *sopt) { +#define RULE_MAXSIZE (256*sizeof(u_int32_t)) INIT_VNET_IPFW(curvnet); -#define RULE_MAXSIZE (256*sizeof(u_int32_t)) int error; size_t size; struct ip_fw *buf, *rule; ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#8 (text+ko) ==== @@ -3043,6 +3043,7 @@ ip_mroute_modevent(module_t mod, int type, void *unused) { INIT_VNET_INET(curvnet); + switch (type) { case MOD_LOAD: MROUTER_LOCK_INIT(); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#14 (text+ko) ==== @@ -88,7 +88,6 @@ #endif int path_mtu_discovery = 1; - SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, path_mtu_discovery, CTLFLAG_RW, path_mtu_discovery, 1, "Enable Path MTU Discovery"); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#17 (text+ko) ==== @@ -628,7 +628,6 @@ tcp_newtcpcb(struct inpcb *inp) { INIT_VNET_INET(inp->inp_vnet); - struct tcpcb_mem *tm; struct tcpcb *tp; #ifdef INET6 ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#19 (text+ko) ==== @@ -354,10 +354,10 @@ syncache_timer(void *xsch) { struct syncache_head *sch = (struct syncache_head *)xsch; + INIT_VNET_INET(sch->sch_vnet); struct syncache *sc, *nsc; int tick = ticks; char *s; - INIT_VNET_INET(sch->sch_vnet); /* NB: syncache_head has already been locked by the callout. */ SCH_LOCK_ASSERT(sch); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#8 (text+ko) ==== @@ -1098,10 +1098,10 @@ { struct inpcb *inp = tp->t_inpcb, *oinp; struct socket *so = inp->inp_socket; + INIT_VNET_INET(so->so_vnet); struct in_addr laddr; u_short lport; int error; - INIT_VNET_INET(so->so_vnet); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp); @@ -1154,10 +1154,10 @@ { struct inpcb *inp = tp->t_inpcb, *oinp; struct socket *so = inp->inp_socket; + INIT_VNET_INET(so->so_vnet); struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)nam; struct in6_addr *addr6; int error; - INIT_VNET_INET(so->so_vnet); INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809211753.m8LHrd5D025948>