summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2014-01-08 03:16:21 +0000
committerpeter <peter@FreeBSD.org>2014-01-08 03:16:21 +0000
commitaa3916c7c098ec3101058ec25b49ae6ff93e47dd (patch)
tree7ae3d149989abad3dc9cd2a0c137b061177b7f2e
parent5190528326a1660f4975550150e35bfa7dd42396 (diff)
downloadFreeBSD-src-aa3916c7c098ec3101058ec25b49ae6ff93e47dd.zip
FreeBSD-src-aa3916c7c098ec3101058ec25b49ae6ff93e47dd.tar.gz
Revert MFC of r258821 - it was already handled by MFC of r239672.
Pointy hat to: peter
-rw-r--r--sys/netinet/tcp_input.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e486fcf..36a665a 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2429,15 +2429,13 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
hhook_run_tcp_est_in(tp, th, &to);
if (SEQ_LEQ(th->th_ack, tp->snd_una)) {
- if (tlen == 0 && tiwin == tp->snd_wnd &&
- !(thflags & TH_FIN)) {
+ if (tlen == 0 && tiwin == tp->snd_wnd) {
TCPSTAT_INC(tcps_rcvdupack);
/*
* If we have outstanding data (other than
* a window probe), this is a completely
* duplicate ack (ie, window info didn't
- * change and FIN isn't set),
- * the ack is the biggest we've
+ * change), the ack is the biggest we've
* seen and we've seen exactly our rexmt
* threshhold of them, assume a packet
* has been dropped and retransmit it.
OpenPOWER on IntegriCloud