summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1996-07-12 17:28:47 +0000
committerdg <dg@FreeBSD.org>1996-07-12 17:28:47 +0000
commit6657f01bfd009bbf4ec0481a17712259abf8ea77 (patch)
treec9bb433f5b0aa761725416c0870aecab7fcc76e4 /sys
parent48c30a896bf1b18eaeda0b3128342b6db44c2296 (diff)
downloadFreeBSD-src-6657f01bfd009bbf4ec0481a17712259abf8ea77.zip
FreeBSD-src-6657f01bfd009bbf4ec0481a17712259abf8ea77.tar.gz
Fixed two bugs in previous commit: be sure to include tcp_debug.h when
TCPDEBUG is defined, and fix typo in TCPDEBUG2() macro.
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/tcp_timer.c5
-rw-r--r--sys/netinet/tcp_usrreq.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index a1c3d13..73396b3 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_timer.c 8.2 (Berkeley) 5/24/95
- * $Id: tcp_timer.c,v 1.17 1996/06/03 15:37:52 jdp Exp $
+ * $Id: tcp_timer.c,v 1.18 1996/07/11 16:32:35 wollman Exp $
*/
#ifndef TUBA_INCLUDE
@@ -63,6 +63,9 @@
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/tcpip.h>
+#ifdef TCPDEBUG
+#include <netinet/tcp_debug.h>
+#endif
int tcp_keepidle = TCPTV_KEEP_IDLE;
SYSCTL_INT(_net_inet_tcp, TCPCTL_KEEPIDLE, keepidle,
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index c7c62b2..9fb4d48 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94
- * $Id: tcp_usrreq.c,v 1.22 1996/03/11 15:13:37 davidg Exp $
+ * $Id: tcp_usrreq.c,v 1.23 1996/07/11 16:32:38 wollman Exp $
*/
#include <sys/param.h>
@@ -398,7 +398,7 @@ tcp_usrreq(so, req, m, nam, control)
#ifdef TCPDEBUG
#define TCPDEBUG0 int ostate
#define TCPDEBUG1() ostate = tp ? tp->t_state : 0
-#define TCPDEBUG2(req) if (tp && (so->so_options & SO_DEBUG)) && \
+#define TCPDEBUG2(req) if (tp && (so->so_options & SO_DEBUG)) \
tcp_trace(TA_USER, ostate, tp, 0, req)
#else
#define TCPDEBUG0
OpenPOWER on IntegriCloud