diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-09-03 14:34:14 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-09-03 14:34:14 +0000 |
| commit | 32033dd9669a9921fb125d4cb1a35ea49b3dcdb5 (patch) | |
| tree | 814f7145c8a3e7f7379af02323e048626ac59fd0 /sys | |
| parent | b9d6112faf35f4cc5d204ebfc255dc4e38efbc20 (diff) | |
Reduce the factor of the limits derived form NMBCLUSTERS. We want
the additional clusters in the socket buffer and not elsewhere.
OK claudio@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pfvar.h | 6 | ||||
| -rw-r--r-- | sys/netinet/tcp_subr.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 3193e8ab3a8..eba38b0a858 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.436 2016/08/20 08:34:30 procter Exp $ */ +/* $OpenBSD: pfvar.h,v 1.437 2016/09/03 14:34:13 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1411,8 +1411,8 @@ struct pf_divert { }; /* Fragment entries reference mbuf clusters, so base the default on that. */ -#define PFFRAG_FRENT_HIWAT (NMBCLUSTERS / 4) /* Number of entries */ -#define PFFRAG_FRAG_HIWAT (NMBCLUSTERS / 8) /* Number of packets */ +#define PFFRAG_FRENT_HIWAT (NMBCLUSTERS / 16) /* Number of entries */ +#define PFFRAG_FRAG_HIWAT (NMBCLUSTERS / 32) /* Number of packets */ #define PFR_KTABLE_HIWAT 1000 /* Number of tables */ #define PFR_KENTRY_HIWAT 200000 /* Number of table entries */ diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 7940a856cf9..11ce7055483 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.152 2016/08/31 11:05:05 mpi Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.153 2016/09/03 14:34:13 bluhm Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -120,7 +120,7 @@ u_int32_t tcp_now = 1; #define TCB_INITIAL_HASH_SIZE 128 #endif -int tcp_reass_limit = NMBCLUSTERS / 2; /* hardlimit for tcpqe_pool */ +int tcp_reass_limit = NMBCLUSTERS / 8; /* hardlimit for tcpqe_pool */ #ifdef TCP_SACK int tcp_sackhole_limit = 32*1024; /* hardlimit for sackhl_pool */ #endif |