Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 7 Jul 2011 10:37:14 +0000 (UTC)
From:      Andre Oppermann <andre@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r223839 - in head/sys: conf kern netinet
Message-ID:  <201107071037.p67AbEQF059634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: andre
Date: Thu Jul  7 10:37:14 2011
New Revision: 223839
URL: http://svn.freebsd.org/changeset/base/223839

Log:
  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

Modified:
  head/sys/conf/options
  head/sys/kern/uipc_socket.c
  head/sys/netinet/tcp_subr.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Thu Jul  7 09:51:31 2011	(r223838)
+++ head/sys/conf/options	Thu Jul  7 10:37:14 2011	(r223839)
@@ -427,7 +427,6 @@ SLIP_IFF_OPTS		opt_slip.h
 TCPDEBUG
 TCP_OFFLOAD_DISABLE	opt_inet.h #Disable code to dispatch tcp offloading
 TCP_SIGNATURE		opt_inet.h
-TCP_SORECEIVE_STREAM	opt_inet.h
 VLAN_ARRAY		opt_vlan.h
 XBONEHACK
 FLOWTABLE		opt_route.h

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Thu Jul  7 09:51:31 2011	(r223838)
+++ head/sys/kern/uipc_socket.c	Thu Jul  7 10:37:14 2011	(r223839)
@@ -1915,7 +1915,6 @@ release:
 /*
  * Optimized version of soreceive() for stream (TCP) sockets.
  */
-#ifdef TCP_SORECEIVE_STREAM
 int
 soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
     struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
@@ -2109,7 +2108,6 @@ out:
 	sbunlock(sb);
 	return (error);
 }
-#endif /* TCP_SORECEIVE_STREAM */
 
 /*
  * Optimized version of soreceive() for simple datagram cases from userspace.

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Thu Jul  7 09:51:31 2011	(r223838)
+++ head/sys/netinet/tcp_subr.c	Thu Jul  7 10:37:14 2011	(r223839)
@@ -206,11 +206,9 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO,
     &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))

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107071037.p67AbEQF059634>