D21907.id62966.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21907.id62966.diff
View Options

	Index: sys/netinet/tcp_output.c
	===================================================================
	--- sys/netinet/tcp_output.c
	+++ sys/netinet/tcp_output.c
	@@ -503,6 +503,13 @@
	KASSERT(len >= 0, ("[%s:%d]: len < 0", __func__, __LINE__));

	tcp_sndbuf_autoscale(tp, so, sendwin);
	+ /*
	+ * Compute window scaling to request:
	+ * Scale to fit into sweet spot. See tcp_syncache.c.
	+ */
	+ while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
	+ (TCP_MAXWIN << tp->request_r_scale) < sb_max)
	+ tp->request_r_scale++;

	/*
	* Decide if we can use TCP Segmentation Offloading (if supported by
	Index: sys/netinet/tcp_usrreq.c
	===================================================================
	--- sys/netinet/tcp_usrreq.c
	+++ sys/netinet/tcp_usrreq.c
	@@ -1428,15 +1428,6 @@
	in_pcbrehash(inp);
	INP_HASH_WUNLOCK(&V_tcbinfo);

	- /*
	- * Compute window scaling to request:
	- * Scale to fit into sweet spot. See tcp_syncache.c.
	- * XXX: This should move to tcp_output().
	- */
	- while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
	- (TCP_MAXWIN << tp->request_r_scale) < sb_max)
	- tp->request_r_scale++;
	-
	soisconnecting(so);
	TCPSTAT_INC(tcps_connattempt);
	tcp_state_change(tp, TCPS_SYN_SENT);
	@@ -1473,11 +1464,6 @@
	goto out;
	INP_HASH_WUNLOCK(&V_tcbinfo);

	- /* Compute window scaling to request. */
	- while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
	- (TCP_MAXWIN << tp->request_r_scale) < sb_max)
	- tp->request_r_scale++;
	-
	soisconnecting(inp->inp_socket);
	TCPSTAT_INC(tcps_connattempt);
	tcp_state_change(tp, TCPS_SYN_SENT);