From owner-p4-projects@FreeBSD.ORG Sun Nov 30 16:29:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C069D1065752; Sun, 30 Nov 2008 16:29:52 +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 B1B111065677 for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F6648FC1F for ; Sun, 30 Nov 2008 16:29:51 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUGT2Jq062967 for ; Sun, 30 Nov 2008 16:29:51 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIGb6O080155 for perforce@freebsd.org; Sat, 29 Nov 2008 18:16:37 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 29 Nov 2008 18:16:37 GMT Message-Id: <200811291816.mATIGb6O080155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153774 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: Sun, 30 Nov 2008 16:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=153774 Change 153774 by zec@zec_tpx32 on 2008/11/29 18:16:13 Merge fixes from vimage branch. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#15 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#32 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#18 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#15 (text+ko) ==== @@ -791,7 +791,6 @@ void in_delayed_cksum(struct mbuf *m) { - INIT_VNET_INET(curvnet); struct ip *ip; u_short csum, offset; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#32 (text+ko) ==== @@ -201,7 +201,7 @@ "Enable tcp_drain routine for extra help when low on mbufs"); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount, - CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs"); + CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs"); SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst, CTLFLAG_RW, icmp_may_rst, 0, ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#27 (text+ko) ==== @@ -1197,7 +1197,7 @@ sin = (struct sockaddr_in *)nam; if (prison_remote_ip4(td->td_ucred, &sin->sin_addr) != 0) { INP_WUNLOCK(inp); - INP_INFO_WUNLOCK(&udbinfo); + INP_INFO_WUNLOCK(&V_udbinfo); return (EAFNOSUPPORT); } error = in_pcbconnect(inp, nam, td->td_ucred); ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#18 (text+ko) ==== @@ -332,16 +332,6 @@ #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) -static __inline uint16_t ip_newid(void); -extern int ip_do_randomid; - -static __inline uint16_t -ip_newid(void) -{ - if (V_ip_do_randomid) - return ip_randomid(); - - return htons(V_ip_id++); -} +#define ip_newid() (V_ip_do_randomid != 0 ? ip_randomid() : htons(V_ip_id++)) #endif /* !_NETINET_VINET_H_ */