From owner-svn-src-user@FreeBSD.ORG  Fri Jun 15 07:42:45 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1D2DE106564A;
	Fri, 15 Jun 2012 07:42:45 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 094868FC15;
	Fri, 15 Jun 2012 07:42:45 +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 q5F7gip7052465;
	Fri, 15 Jun 2012 07:42:44 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5F7giAF052463;
	Fri, 15 Jun 2012 07:42:44 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201206150742.q5F7giAF052463@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Fri, 15 Jun 2012 07:42:44 +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: r237121 - user/andre/tcp_workqueue/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: Fri, 15 Jun 2012 07:42:45 -0000

Author: andre
Date: Fri Jun 15 07:42:44 2012
New Revision: 237121
URL: http://svn.freebsd.org/changeset/base/237121

Log:
  Remove bogus 'else' in #ifdef that prevented the rttvar from being reset on
  retransmit for IPv6 sessions.

Modified:
  user/andre/tcp_workqueue/sys/netinet/tcp_timer.c

Modified: user/andre/tcp_workqueue/sys/netinet/tcp_timer.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_timer.c	Fri Jun 15 07:38:56 2012	(r237120)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_timer.c	Fri Jun 15 07:42:44 2012	(r237121)
@@ -577,7 +577,6 @@ tcp_timer_rexmt(void * xtp)
 #ifdef INET6
 		if ((tp->t_inpcb->inp_vflag & INP_IPV6) != 0)
 			in6_losing(tp->t_inpcb);
-		else
 #endif
 		tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);
 		tp->t_srtt = 0;