svn commit: r334727 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Wed Jun  6 19:48:39 2018
New Revision: 334727
URL: https://svnweb.freebsd.org/changeset/base/334727

Log:
  MFC r333178:
  
  Simplify the call to tcp_drop(), since the handling of soft error
  is also done in tcp_drop(). No functional change.
  
  Sponsored by:		Netflix, Inc.

Modified:
  stable/11/sys/netinet/tcp_timer.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/tcp_timer.c
==============================================================================
--- stable/11/sys/netinet/tcp_timer.c	Wed Jun  6 19:36:37 2018	(r334726)
+++ stable/11/sys/netinet/tcp_timer.c	Wed Jun  6 19:48:39 2018	(r334727)
@@ -619,8 +619,7 @@ tcp_timer_rexmt(void * xtp)
 		tp->t_rxtshift = TCP_MAXRXTSHIFT;
 		TCPSTAT_INC(tcps_timeoutdrop);
 
-		tp = tcp_drop(tp, tp->t_softerror ?
-			      tp->t_softerror : ETIMEDOUT);
+		tp = tcp_drop(tp, ETIMEDOUT);
 		headlocked = 1;
 		goto out;
 	}