D51425.id158786.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51425.id158786.diff
View Options

	diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
	--- a/sys/netinet/tcp_input.c
	+++ b/sys/netinet/tcp_input.c
	@@ -1515,7 +1515,9 @@
	struct tcpopt to;
	int tfo_syn;
	u_int maxseg = 0;
	+ bool no_data;

	+ no_data = (tlen == 0);
	thflags = tcp_get_flags(th);
	tp->sackhint.last_sack_ack = 0;
	sack_changed = SACK_NOCHANGE;
	@@ -1754,7 +1756,7 @@
	tp->ts_recent = to.to_tsval;
	}

	- if (tlen == 0) {
	+ if (no_data) {
	if (SEQ_GT(th->th_ack, tp->snd_una) &&
	SEQ_LEQ(th->th_ack, tp->snd_max) &&
	!IN_RECOVERY(tp->t_flags) &&
	@@ -2557,7 +2559,7 @@

	if (SEQ_LEQ(th->th_ack, tp->snd_una)) {
	maxseg = tcp_maxseg(tp);
	- if (tlen == 0 &&
	+ if (no_data &&
	(tiwin == tp->snd_wnd \|\|
	(tp->t_flags & TF_SACK_PERMIT))) {
	/*
	@@ -3113,8 +3115,7 @@
	(tp->snd_wl1 == th->th_seq && (SEQ_LT(tp->snd_wl2, th->th_ack) \|\|
	(tp->snd_wl2 == th->th_ack && tiwin > tp->snd_wnd))))) {
	/* keep track of pure window updates */
	- if (tlen == 0 &&
	- tp->snd_wl2 == th->th_ack && tiwin > tp->snd_wnd)
	+ if (no_data && tp->snd_wl2 == th->th_ack && tiwin > tp->snd_wnd)
	TCPSTAT_INC(tcps_rcvwinupd);
	tp->snd_wnd = tiwin;
	tp->snd_wl1 = th->th_seq;