From owner-cvs-src@FreeBSD.ORG  Sun Jun 11 16:21:02 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 38F8916A41F;
	Sun, 11 Jun 2006 16:21:02 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6424743D5E;
	Sun, 11 Jun 2006 16:21:01 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5BGIoHW096144;
	Sun, 11 Jun 2006 16:18:50 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5BGIoS1096143;
	Sun, 11 Jun 2006 16:18:50 GMT (envelope-from rwatson)
Message-Id: <200606111618.k5BGIoS1096143@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 11 Jun 2006 16:18:50 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netinet tcp_input.c tcp_timer.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 11 Jun 2006 16:21:02 -0000

rwatson     2006-06-11 16:18:50 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netinet          tcp_input.c tcp_timer.c 
  Log:
  Merge tcp_input.c:1.292, tcp_timer.c:1.77 from HEAD to RELENG_6:
  
    Explicitly assert socket pointer is non-NULL in tcp_input() so as to
    provide better debugging information.
  
    Prefer explicit comparison to NULL for tcpcb pointers rather than
    treating them as booleans.
  
  Revision   Changes    Path
  1.281.2.7  +4 -3      src/sys/netinet/tcp_input.c
  1.74.2.3   +8 -8      src/sys/netinet/tcp_timer.c