svn commit: r225046 - head/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Sat Aug 20 18:45:38 2011
New Revision: 225046
URL: http://svn.freebsd.org/changeset/base/225046

Log:
  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)

Modified:
  head/sys/netinet/tcp_input.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Sat Aug 20 17:11:51 2011	(r225045)
+++ head/sys/netinet/tcp_input.c	Sat Aug 20 18:45:38 2011	(r225046)
@@ -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;
 	}