svn commit: r226769 - user/adrian/if_ath_tx/sys/netinet

[Adrian Chadd]

Author: adrian
Date: Tue Oct 25 23:57:38 2011
New Revision: 226769
URL: http://svn.freebsd.org/changeset/base/226769

Log:
  Fix (one of many!) broken merge artifacts.

Modified:
  user/adrian/if_ath_tx/sys/netinet/tcp_input.c

Modified: user/adrian/if_ath_tx/sys/netinet/tcp_input.c
==============================================================================
--- user/adrian/if_ath_tx/sys/netinet/tcp_input.c	Tue Oct 25 23:51:18 2011	(r226768)
+++ user/adrian/if_ath_tx/sys/netinet/tcp_input.c	Tue Oct 25 23:57:38 2011	(r226769)
@@ -978,8 +978,10 @@ relocked:
 #ifdef TCPDEBUG
 	if (so->so_options & SO_DEBUG) {
 		ostate = tp->t_state;
+#ifdef INET6
 		if (isipv6) {
 			bcopy((char *)ip6, (char *)tcp_saveipgen, sizeof(*ip6));
+		} else
 #endif
 			bcopy((char *)ip, (char *)tcp_saveipgen, sizeof(*ip));
 		tcp_savetcp = *th;