svn commit: r211901 - stable/8/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Fri Aug 27 21:52:05 2010
New Revision: 211901
URL: http://svn.freebsd.org/changeset/base/211901

Log:
  MFC r211451:
  
    When calculating the expected memory size for userspace, also take the
    number of syncache entries into account for the surplus we add to account
    for a possible increase of records in the re-entry window.
  
    Discussed with:		jhb, silby

Modified:
  stable/8/sys/netinet/tcp_subr.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet/tcp_subr.c
==============================================================================
--- stable/8/sys/netinet/tcp_subr.c	Fri Aug 27 21:31:15 2010	(r211900)
+++ stable/8/sys/netinet/tcp_subr.c	Fri Aug 27 21:52:05 2010	(r211901)
@@ -1018,7 +1018,7 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
 	if (req->oldptr == NULL) {
 		m = syncache_pcbcount();
 		n = V_tcbinfo.ipi_count;
-		n += imax(n / 8, 10);
+		n += imax((m + n) / 8, 10);
 		req->oldidx = 2 * (sizeof xig) +
 		    (m + n) * sizeof(struct xtcpcb);
 		return (0);