Date: Tue, 25 Oct 2011 23:57:38 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r226769 - user/adrian/if_ath_tx/sys/netinet Message-ID: <201110252357.p9PNvccn022784@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110252357.p9PNvccn022784>