diff options
| author | des <des@FreeBSD.org> | 2007-07-30 11:06:42 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2007-07-30 11:06:42 +0000 |
| commit | a969e2957be55a6de5c5d2a0466d00943b4f4c80 (patch) | |
| tree | f9bf5e42e9c6d203db78a053255c80161fd541e3 /sys/netipx | |
| parent | 0511205d5e160e55d9266cc7536474a1fe202ebc (diff) | |
| download | FreeBSD-src-a969e2957be55a6de5c5d2a0466d00943b4f4c80.zip FreeBSD-src-a969e2957be55a6de5c5d2a0466d00943b4f4c80.tar.gz | |
Make tcpstates[] static, and make sure TCPSTATES is defined before
<netinet/tcp_fsm.h> is included into any compilation unit that needs
tcpstates[]. Also remove incorrect extern declarations and TCPDEBUG
conditionals. This allows kernels both with and without TCPDEBUG to
build, and unbreaks the tinderbox.
Approved by: re (rwatson)
Diffstat (limited to 'sys/netipx')
| -rw-r--r-- | sys/netipx/spx_debug.c | 2 | ||||
| -rw-r--r-- | sys/netipx/spx_debug.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c index 1654bc0..7f48261 100644 --- a/sys/netipx/spx_debug.c +++ b/sys/netipx/spx_debug.c @@ -69,6 +69,8 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/protosw.h> +#define TCPSTATES /* for logging */ + #include <netinet/in_systm.h> #include <netinet/tcp_fsm.h> diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h index 24a76f4..24405bc 100644 --- a/sys/netipx/spx_debug.h +++ b/sys/netipx/spx_debug.h @@ -95,7 +95,6 @@ int spx_debx; #ifdef _KERNEL extern char *prurequests[]; extern char *sanames[]; -extern char *tcpstates[]; void spx_trace(short act, u_char ostate, struct spxpcb *sp, struct spx *si, int req); |
