Date: Wed, 4 Mar 2009 14:02:51 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 158672 for review Message-ID: <200903041402.n24E2p3P003289@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=158672 Change 158672 by zec@zec_amdx2 on 2009/03/04 14:02:19 Nuke V_tcp_ipi_zone, shadowed by V_tcbinfo.ipi_zone. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#75 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#50 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#75 (text+ko) ==== @@ -279,7 +279,6 @@ #ifdef VIMAGE_GLOBALS static uma_zone_t tcpcb_zone; -static struct uma_zone *tcp_ipi_zone; #endif /* @@ -290,7 +289,6 @@ { INIT_VNET_INET(curvnet); /* XXX */ - uma_zone_set_max(V_tcp_ipi_zone, maxsockets); uma_zone_set_max(V_tcpcb_zone, maxsockets); tcp_tw_zone_change(); } @@ -347,9 +345,6 @@ V_tcp_autosndbuf_max = 256*1024; - V_tcp_ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), - NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(V_tcp_ipi_zone, maxsockets); /* * These have to be type stable for the benefit of the timers. */ @@ -395,7 +390,9 @@ &V_tcbinfo.ipi_hashmask); V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_porthashmask); - V_tcbinfo.ipi_zone = V_tcp_ipi_zone; + V_tcbinfo.ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), + NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); V_tcbinfo.ipi_vnet = curvnet; #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) ==== //depot/projects/vimage/src/sys/netinet/vinet.h#50 (text+ko) ==== @@ -86,7 +86,6 @@ struct tcp_hostcache _tcp_hostcache; struct callout _tcp_hc_callout; - struct uma_zone *_tcp_ipi_zone; struct uma_zone *_tcp_reass_zone; struct uma_zone *_tcpcb_zone; struct uma_zone *_tcptw_zone; @@ -326,7 +325,6 @@ #define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) #define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) #define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_ipi_zone VNET_INET(tcp_ipi_zone) #define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) #define V_tcp_minmss VNET_INET(tcp_minmss) #define V_tcp_mssdflt VNET_INET(tcp_mssdflt)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903041402.n24E2p3P003289>