svn commit: r345851 - head/sys/netinet

[Randall Stewart]

Author: rrs
Date: Wed Apr  3 19:35:07 2019
New Revision: 345851
URL: https://svnweb.freebsd.org/changeset/base/345851

Log:
  Undo my previous erroneous commit changing the tcp_output kassert.
  Hmm now the question is where did the tcp_log_id change go :o

Modified:
  head/sys/netinet/tcp_output.c

Modified: head/sys/netinet/tcp_output.c
==============================================================================
--- head/sys/netinet/tcp_output.c	Wed Apr  3 18:35:13 2019	(r345850)
+++ head/sys/netinet/tcp_output.c	Wed Apr  3 19:35:07 2019	(r345851)
@@ -138,8 +138,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, sendbuf_auto_lowat
  * non-ACK.
  */
 #define TCP_XMIT_TIMER_ASSERT(tp, len, th_flags)			\
-	KASSERT(((len) == 0 && ((th_flags) &				\
-				(TH_SYN | TH_FIN | TH_RST)) != 0) ||	\
+	KASSERT(((len) == 0 && ((th_flags) & (TH_SYN | TH_FIN)) == 0) ||\
 	    tcp_timer_active((tp), TT_REXMT) ||				\
 	    tcp_timer_active((tp), TT_PERSIST),				\
 	    ("neither rexmt nor persist timer is set"))