From owner-cvs-src@FreeBSD.ORG  Thu Jan  6 20:27:31 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B515016A4CE; Thu,  6 Jan 2005 20:27:31 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8D35F43D4C; Thu,  6 Jan 2005 20:27:31 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06KRVIO042374;
	Thu, 6 Jan 2005 20:27:31 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06KRVTp042373;
	Thu, 6 Jan 2005 20:27:31 GMT
	(envelope-from rwatson)
Message-Id: <200501062027.j06KRVTp042373@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 6 Jan 2005 20:27:31 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/netinet tcp_timer.c tcp_var.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2005 20:27:31 -0000

rwatson     2005-01-06 20:27:31 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          tcp_timer.c tcp_var.h 
  Log:
  Merge tcp_timer.c:1.72 and tcp_var.h:1.113 from HEAD to RELENG_5:
  
    date: 2004/12/23 01:25:59;  author: rwatson;  state: Exp;  lines: +0 -15
    date: 2004/12/23 01:25:59;  author: rwatson;  state: Exp;  lines: +0 -1
    Remove the now unused tcp_canceltimers() function.  tcpcb timers are
    now stopped as part of tcp_discardcb().
  
    MFC after:      2 weeks
  
  Revision   Changes    Path
  1.66.2.5   +0 -15     src/sys/netinet/tcp_timer.c
  1.109.2.2  +0 -1      src/sys/netinet/tcp_var.h