From owner-svn-src-user@FreeBSD.ORG  Tue Oct 25 23:57:39 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BA31106566B;
	Tue, 25 Oct 2011 23:57:39 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF8758FC14;
	Tue, 25 Oct 2011 23:57:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9PNvcTC022786;
	Tue, 25 Oct 2011 23:57:38 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9PNvccn022784;
	Tue, 25 Oct 2011 23:57:38 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201110252357.p9PNvccn022784@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 25 Oct 2011 23:57:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226769 - user/adrian/if_ath_tx/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Oct 2011 23:57:39 -0000

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;