From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 19:55:51 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E85116A4D0; Wed,  5 Nov 2003 19:55:51 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0799516A4CE
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 19:55:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7E14343FE9
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 19:55:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA63toXJ080857
	for <perforce@freebsd.org>; Wed, 5 Nov 2003 19:55:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA63to2c080854
	for perforce@freebsd.org; Wed, 5 Nov 2003 19:55:50 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Nov 2003 19:55:50 -0800 (PST)
Message-Id: <200311060355.hA63to2c080854@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41548 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2003 03:55:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=41548

Change 41548 by sam@sam_ebb on 2003/11/05 19:55:48

	use existing copy instead of doing a pointer deref

Affected files ...

.. //depot/projects/netperf/sys/netinet/tcp_timer.c#4 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/tcp_timer.c#4 (text+ko) ====

@@ -353,8 +353,7 @@
 	tcpstat.tcps_keeptimeo++;
 	if (tp->t_state < TCPS_ESTABLISHED)
 		goto dropit;
-	if ((always_keepalive ||
-	     tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE) &&
+	if ((always_keepalive || inp->inp_socket->so_options & SO_KEEPALIVE) &&
 	    tp->t_state <= TCPS_CLOSING) {
 		if ((ticks - tp->t_rcvtime) >= tcp_keepidle + tcp_maxidle)
 			goto dropit;
@@ -383,7 +382,7 @@
 		callout_reset(tp->tt_keep, tcp_keepidle, tcp_timer_keep, tp);
 
 #ifdef TCPDEBUG
-	if (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)
+	if (inp->inp_socket->so_options & SO_DEBUG)
 		tcp_trace(TA_USER, ostate, tp, (void *)0, (struct tcphdr *)0,
 			  PRU_SLOWTIMO);
 #endif