From 30e63c62365a7274e4847e368a40e6f3ea03029c Mon Sep 17 00:00:00 2001 From: matt Date: Tue, 20 Apr 2004 22:54:31 +0000 Subject: [PATCH] export tcpstates for _KERNEL and remove tcp_usrreq.c's incorrect declartion. --- sys/netinet/tcp_fsm.h | 4 +++- sys/netinet/tcp_usrreq.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h index 71d77624333f..b2208c7f7aee 100644 --- a/sys/netinet/tcp_fsm.h +++ b/sys/netinet/tcp_fsm.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_fsm.h,v 1.13 2003/11/20 16:21:48 yamt Exp $ */ +/* $NetBSD: tcp_fsm.h,v 1.14 2004/04/20 22:54:31 matt Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -93,6 +93,8 @@ const char * const tcpstates[] = { "ESTABLISHED", "CLOSE_WAIT", "FIN_WAIT_1", "CLOSING", "LAST_ACK", "FIN_WAIT_2", "TIME_WAIT", }; +#elif defined(_KERNEL) +extern const char * const tcpstates[]; #endif #endif /* _NETINET_TCP_FSM_H_ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index f7f6d56a9512..915716cd9b53 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_usrreq.c,v 1.88 2004/03/29 04:59:03 atatat Exp $ */ +/* $NetBSD: tcp_usrreq.c,v 1.89 2004/04/20 22:54:31 matt Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.88 2004/03/29 04:59:03 atatat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.89 2004/04/20 22:54:31 matt Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -155,7 +155,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.88 2004/03/29 04:59:03 atatat Exp $ /* * TCP protocol interface to socket abstraction. */ -extern char *tcpstates[]; /* * Process a TCP user request for TCP tb. If this is a send request