From owner-svn-src-all@FreeBSD.ORG  Tue Mar 31 10:17:15 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 58A82E22;
 Tue, 31 Mar 2015 10:17:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4354FAD0;
 Tue, 31 Mar 2015 10:17:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2VAHE9E001920;
 Tue, 31 Mar 2015 10:17:14 GMT (envelope-from jch@FreeBSD.org)
Received: (from jch@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2VAHEa2001919;
 Tue, 31 Mar 2015 10:17:14 GMT (envelope-from jch@FreeBSD.org)
Message-Id: <201503311017.t2VAHEa2001919@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jch set sender to jch@FreeBSD.org
 using -f
From: Julien Charbon <jch@FreeBSD.org>
Date: Tue, 31 Mar 2015 10:17:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280904 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2015 10:17:15 -0000

Author: jch
Date: Tue Mar 31 10:17:13 2015
New Revision: 280904
URL: https://svnweb.freebsd.org/changeset/base/280904

Log:
  Use appropriate timeout_t* instead of void* in tcp_timer_activate()
  
  Suggested by:		imp
  Differential Revision:	https://reviews.freebsd.org/D2154
  Reviewed by:		imp, jhb
  Approved by:		jhb

Modified:
  head/sys/netinet/tcp_timer.c

Modified: head/sys/netinet/tcp_timer.c
==============================================================================
--- head/sys/netinet/tcp_timer.c	Tue Mar 31 09:51:19 2015	(r280903)
+++ head/sys/netinet/tcp_timer.c	Tue Mar 31 10:17:13 2015	(r280904)
@@ -853,7 +853,7 @@ void
 tcp_timer_activate(struct tcpcb *tp, int timer_type, u_int delta)
 {
 	struct callout *t_callout;
-	void *f_callout;
+	timeout_t *f_callout;
 	struct inpcb *inp = tp->t_inpcb;
 	int cpu = inp_to_cpuid(inp);