diff options
| author | andre <andre@FreeBSD.org> | 2011-07-07 10:37:14 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2011-07-07 10:37:14 +0000 |
| commit | 19bc1179a677977e61b7ea614571131cacc3e6f4 (patch) | |
| tree | 80bd24d26b19ebc166bc4e70f71f811b97319f87 /sys/netinet | |
| parent | 20c98461752d97ced076d54e28a0f97e4ecbd4a7 (diff) | |
| download | FreeBSD-src-19bc1179a677977e61b7ea614571131cacc3e6f4.zip FreeBSD-src-19bc1179a677977e61b7ea614571131cacc3e6f4.tar.gz | |
Remove the TCP_SORECEIVE_STREAM compile time option. The use of
soreceive_stream() for TCP still has to be enabled with the loader
tuneable net.inet.tcp.soreceive_stream.
Suggested by: trociny and others
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 043cd87..ead7b85 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -206,11 +206,9 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW, &VNET_NAME(tcp_isn_reseed_interval), 0, "Seconds between reseeding of ISN secret"); -#ifdef TCP_SORECEIVE_STREAM static int tcp_soreceive_stream = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, soreceive_stream, CTLFLAG_RDTUN, &tcp_soreceive_stream, 0, "Using soreceive_stream for TCP sockets"); -#endif #ifdef TCP_SIGNATURE static int tcp_sig_checksigs = 1; @@ -337,13 +335,13 @@ tcp_init(void) tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; tcp_tcbhashsize = hashsize; -#ifdef TCP_SORECEIVE_STREAM TUNABLE_INT_FETCH("net.inet.tcp.soreceive_stream", &tcp_soreceive_stream); if (tcp_soreceive_stream) { tcp_usrreqs.pru_soreceive = soreceive_stream; +#ifdef INET6 tcp6_usrreqs.pru_soreceive = soreceive_stream; +#endif /* INET6 */ } -#endif #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) |
