diff options
| author | bz <bz@FreeBSD.org> | 2011-08-20 18:45:38 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-08-20 18:45:38 +0000 |
| commit | ff90e69a5ad57263f93dafbd3e5a5c47dc656a91 (patch) | |
| tree | 21cb687c4a1654ff7e0c732123ec46351f59c4da | |
| parent | eccbdd061bd53b771dcd87b1708dfbc43cfb72a7 (diff) | |
| download | FreeBSD-src-ff90e69a5ad57263f93dafbd3e5a5c47dc656a91.zip FreeBSD-src-ff90e69a5ad57263f93dafbd3e5a5c47dc656a91.tar.gz | |
Fix compilation in case of defined(INET) && defined(IPFIREWALL_FORWARD)
but no INET6.
Reported by: avg
Tested by: avg
MFC after: 4 weeks
X-MFC with: r225044
Approved by: re (kib)
| -rw-r--r-- | sys/netinet/tcp_input.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 24680c2..7f06bd4 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -581,9 +581,6 @@ tcp_input(struct mbuf *m, int off0) int isipv6; #else const void *ip6 = NULL; -#if (defined(INET) && defined(IPFIREWALL_FORWARD)) || defined(TCPDEBUG) - const int isipv6 = 0; -#endif #endif /* INET6 */ struct tcpopt to; /* options in this segment */ char *s = NULL; /* address and port logging */ @@ -1028,11 +1025,11 @@ relocked: #ifdef TCPDEBUG if (so->so_options & SO_DEBUG) { ostate = tp->t_state; - if (isipv6) { #ifdef INET6 + if (isipv6) { bcopy((char *)ip6, (char *)tcp_saveipgen, sizeof(*ip6)); -#endif } else +#endif bcopy((char *)ip, (char *)tcp_saveipgen, sizeof(*ip)); tcp_savetcp = *th; } |
