Date: Fri, 25 Jul 2008 06:25:42 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 145869 for review Message-ID: <200807250625.m6P6PgiP005667@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145869 Change 145869 by zec@zec_tpx32 on 2008/07/25 06:24:55 Unbreak VIMAGE build. Affected files ... .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#8 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#5 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#8 (text+ko) ==== @@ -123,11 +123,10 @@ static int sysctl_net_ipport_check(SYSCTL_HANDLER_ARGS) { -#ifdef VIMAGE INIT_VNET_INET(curvnet); + int error; + SYSCTL_RESOLVE_V_ARG1(); -#endif - int error; error = sysctl_handle_int(oidp, arg1, arg2, req); if (error == 0) { @@ -1281,15 +1280,16 @@ void inp_apply_all(void (*func)(struct inpcb *, void *), void *arg) { + INIT_VNET_INET(curvnet); struct inpcb *inp; - INP_INFO_RLOCK(&tcbinfo); - LIST_FOREACH(inp, tcbinfo.ipi_listhead, inp_list) { + INP_INFO_RLOCK(&V_tcbinfo); + LIST_FOREACH(inp, V_tcbinfo.ipi_listhead, inp_list) { INP_WLOCK(inp); func(inp, arg); INP_WUNLOCK(inp); } - INP_INFO_RUNLOCK(&tcbinfo); + INP_INFO_RUNLOCK(&V_tcbinfo); } struct socket * ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#5 (text+ko) ==== @@ -944,11 +944,12 @@ tcp_offload_syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, struct socket **lsop, struct mbuf *m) { + INIT_VNET_INET(curvnet); int rc; - INP_INFO_WLOCK(&tcbinfo); + INP_INFO_WLOCK(&V_tcbinfo); rc = syncache_expand(inc, to, th, lsop, m); - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&V_tcbinfo); return (rc); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807250625.m6P6PgiP005667>