From 6f69742441c3fa4ff18f0cfcbb9f5dc4c966e8b1 Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Sat, 20 Aug 2011 18:45:38 +0000 Subject: [PATCH] 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) --- sys/netinet/tcp_input.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 24680c24fabc..7f06bd48bab9 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; }