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
This commit is contained in:
parent
260923853f
commit
1c6e7fa7f1
@ -427,7 +427,6 @@ SLIP_IFF_OPTS opt_slip.h
|
|||||||
TCPDEBUG
|
TCPDEBUG
|
||||||
TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading
|
TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading
|
||||||
TCP_SIGNATURE opt_inet.h
|
TCP_SIGNATURE opt_inet.h
|
||||||
TCP_SORECEIVE_STREAM opt_inet.h
|
|
||||||
VLAN_ARRAY opt_vlan.h
|
VLAN_ARRAY opt_vlan.h
|
||||||
XBONEHACK
|
XBONEHACK
|
||||||
FLOWTABLE opt_route.h
|
FLOWTABLE opt_route.h
|
||||||
|
@ -1915,7 +1915,6 @@ soreceive_generic(struct socket *so, struct sockaddr **psa, struct uio *uio,
|
|||||||
/*
|
/*
|
||||||
* Optimized version of soreceive() for stream (TCP) sockets.
|
* Optimized version of soreceive() for stream (TCP) sockets.
|
||||||
*/
|
*/
|
||||||
#ifdef TCP_SORECEIVE_STREAM
|
|
||||||
int
|
int
|
||||||
soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
|
soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
|
||||||
struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
|
struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
|
||||||
@ -2109,7 +2108,6 @@ soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
|
|||||||
sbunlock(sb);
|
sbunlock(sb);
|
||||||
return (error);
|
return (error);
|
||||||
}
|
}
|
||||||
#endif /* TCP_SORECEIVE_STREAM */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Optimized version of soreceive() for simple datagram cases from userspace.
|
* Optimized version of soreceive() for simple datagram cases from userspace.
|
||||||
|
@ -206,11 +206,9 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW,
|
|||||||
&VNET_NAME(tcp_isn_reseed_interval), 0,
|
&VNET_NAME(tcp_isn_reseed_interval), 0,
|
||||||
"Seconds between reseeding of ISN secret");
|
"Seconds between reseeding of ISN secret");
|
||||||
|
|
||||||
#ifdef TCP_SORECEIVE_STREAM
|
|
||||||
static int tcp_soreceive_stream = 0;
|
static int tcp_soreceive_stream = 0;
|
||||||
SYSCTL_INT(_net_inet_tcp, OID_AUTO, soreceive_stream, CTLFLAG_RDTUN,
|
SYSCTL_INT(_net_inet_tcp, OID_AUTO, soreceive_stream, CTLFLAG_RDTUN,
|
||||||
&tcp_soreceive_stream, 0, "Using soreceive_stream for TCP sockets");
|
&tcp_soreceive_stream, 0, "Using soreceive_stream for TCP sockets");
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef TCP_SIGNATURE
|
#ifdef TCP_SIGNATURE
|
||||||
static int tcp_sig_checksigs = 1;
|
static int tcp_sig_checksigs = 1;
|
||||||
@ -337,13 +335,13 @@ tcp_init(void)
|
|||||||
tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT;
|
tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT;
|
||||||
tcp_tcbhashsize = hashsize;
|
tcp_tcbhashsize = hashsize;
|
||||||
|
|
||||||
#ifdef TCP_SORECEIVE_STREAM
|
|
||||||
TUNABLE_INT_FETCH("net.inet.tcp.soreceive_stream", &tcp_soreceive_stream);
|
TUNABLE_INT_FETCH("net.inet.tcp.soreceive_stream", &tcp_soreceive_stream);
|
||||||
if (tcp_soreceive_stream) {
|
if (tcp_soreceive_stream) {
|
||||||
tcp_usrreqs.pru_soreceive = soreceive_stream;
|
tcp_usrreqs.pru_soreceive = soreceive_stream;
|
||||||
|
#ifdef INET6
|
||||||
tcp6_usrreqs.pru_soreceive = soreceive_stream;
|
tcp6_usrreqs.pru_soreceive = soreceive_stream;
|
||||||
|
#endif /* INET6 */
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef INET6
|
#ifdef INET6
|
||||||
#define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr))
|
#define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr))
|
||||||
|
Loading…
Reference in New Issue
Block a user