Fixed a #ifdef defined()... typo that turned into a compilation failure.

4 files changed, 20 insertions, 19 deletions

diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index e2140aec80d..b32970f4f4a 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp.h,v 1.6 1999/01/11 02:01:35 deraadt Exp $	*/
+/*	$OpenBSD: tcp.h,v 1.7 1999/07/02 21:22:13 cmetz Exp $	*/
 /*	$NetBSD: tcp.h,v 1.8 1995/04/17 05:32:58 cgd Exp $	*/
 
 /*
@@ -86,6 +86,8 @@ struct tcphdr {
 #define	   TCPOLEN_TIMESTAMP		10
 #define	   TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
 
+#define	MAX_TCPOPTLEN		40	/* Absolute maximum TCP options len */
+
 #define TCPOPT_TSTAMP_HDR	\
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
 
@@ -114,8 +116,8 @@ struct tcphdr {
 /*
  * User-settable options (used with setsockopt).
  */
-#define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
-#define	TCP_MAXSEG	0x02	/* set maximum segment size */
-#define	TCP_SACK_DISABLE 0x300	/* disable SACKs(if enabled by deflt.)*/
+#define	TCP_NODELAY		0x01   /* don't delay send to coalesce pkts */
+#define	TCP_MAXSEG		0x02   /* set maximum segment size */
+#define	TCP_SACK_DISABLE	0x300  /* disable SACKs (if enabled by def.) */
 
 #endif /* !_NETINET_TCP_H_ */
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 724288a37e8..72192c5f81b 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_output.c,v 1.17 1999/07/02 20:39:08 cmetz Exp $	*/
+/*	$OpenBSD: tcp_output.c,v 1.18 1999/07/02 21:22:13 cmetz Exp $	*/
 /*	$NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $	*/
 
 /*
@@ -433,7 +433,7 @@ send:
 	 */
 	optlen = 0;
 
-#ifdef defined(INET) && defined(INET6)
+#if defined(INET) && defined(INET6)
 	switch(tp->pf) {
 #else /* defined(INET) && defined(INET6) */
 	switch(0) {
@@ -724,7 +724,7 @@ send:
 		tp->snd_up = tp->snd_una;		/* drag it along */
 
 	/* Put TCP length in pseudo-header */
-#ifdef defined(INET) && defined(INET6)
+#if defined(INET) && defined(INET6)
 	switch(tp->pf) {
 #else /* defined(INET) && defined(INET6) */
 	switch(0) {
@@ -747,7 +747,7 @@ send:
 	 * Put TCP length in extended header, and then
 	 * checksum extended header and data.
 	 */
-#ifdef defined(INET) && defined(INET6)
+#if defined(INET) && defined(INET6)
 	switch (tp->pf) {
 #else /* defined(INET) && defined(INET6) */
 	switch (0) {
@@ -852,7 +852,7 @@ send:
 	 */
 	m->m_pkthdr.len = hdrlen + len;
 
-#ifdef defined(INET) && defined(INET6)
+#if defined(INET) && defined(INET6)
 	switch(tp->pf) {
 #else /* defined(INET) && defined(INET6) */
 	switch(0) {
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 64fb6c7e098..9057af33ff9 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.15 1999/07/02 20:39:08 cmetz Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.16 1999/07/02 21:22:14 cmetz Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -171,7 +171,7 @@ tcp_template(tp)
 		if (m == NULL)
 			return (0);
 
-#ifdef defined(INET) && defined(INET6)
+#if defined(INET) && defined(INET6)
 		switch (tp->pf) {
 #else /* defined(INET) && defined(INET6) */
 		switch (0) {
@@ -204,7 +204,7 @@ tcp_template(tp)
 		}
 	}
 
-#ifdef defined(INET) && defined(INET6)
+#if defined(INET) && defined(INET6)
 	switch(tp->pf) {
 #else /* defined(INET) && defined(INET6) */
 	switch(0) {
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index f7ac9a841b3..3dfc0277860 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.19 1999/03/27 21:04:21 provos Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.20 1999/07/02 21:22:14 cmetz Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -77,8 +77,7 @@ struct tcpcb {
 #define	TF_RCVD_TSTMP	0x0100		/* a timestamp was received in SYN */
 #define	TF_SACK_PERMIT	0x0200		/* other side said I could SACK */
 
-	struct	tcpiphdr *t_template;	/* skeletal packet for transmit, will
-					 * be either tcpiphdr or tcpipv6hdr */
+	struct	mbuf *t_template;	/* skeletal packet for transmit */
 	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
 /*
  * The following fields are used as in the protocol specification.
@@ -341,15 +340,15 @@ int	 tcp_output __P((struct tcpcb *));
 void	 tcp_pulloutofband __P((struct socket *, u_int, struct mbuf *));
 void	 tcp_quench __P((struct inpcb *, int));
 int	 tcp_reass __P((struct tcpcb *, struct tcphdr *, struct mbuf *, int *));
-void	 tcp_respond __P((struct tcpcb *,
-	    struct tcpiphdr *, struct mbuf *, tcp_seq, tcp_seq, int));
+void	 tcp_respond __P((struct tcpcb *, caddr_t, struct mbuf *, tcp_seq,
+		tcp_seq, int));
 void	 tcp_setpersist __P((struct tcpcb *));
 void	 tcp_slowtimo __P((void));
-struct tcpiphdr *
+struct mbuf *
 	 tcp_template __P((struct tcpcb *));
 struct tcpcb *
 	 tcp_timers __P((struct tcpcb *, int));
-void	 tcp_trace __P((int, int, struct tcpcb *, struct tcpiphdr *, int, int));
+void	 tcp_trace __P((int, int, struct tcpcb *, caddr_t, int, int));
 struct tcpcb *
 	 tcp_usrclosed __P((struct tcpcb *));
 int	 tcp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));