From owner-svn-src-user@FreeBSD.ORG Fri Nov 14 02:11:57 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF8AC106568A; Fri, 14 Nov 2008 02:11:57 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A721A8FC12; Fri, 14 Nov 2008 02:11:57 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAE2BvTs075738; Fri, 14 Nov 2008 02:11:57 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAE2BvIe075736; Fri, 14 Nov 2008 02:11:57 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200811140211.mAE2BvIe075736@svn.freebsd.org> From: Kip Macy Date: Fri, 14 Nov 2008 02:11:57 +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: r184952 - user/kmacy/HEAD_fast_multi_xmit/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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2008 02:11:57 -0000 Author: kmacy Date: Fri Nov 14 02:11:57 2008 New Revision: 184952 URL: http://svn.freebsd.org/changeset/base/184952 Log: change TF_RECURSE to TF_RECURSED to make its use as a single-bit recursion counter clearer Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c Fri Nov 14 02:11:11 2008 (r184951) +++ user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_subr.c Fri Nov 14 02:11:57 2008 (r184952) @@ -1579,11 +1579,14 @@ tcp_mtudisc(struct inpcb *inp, int errno tp->snd_recover = tp->snd_max; if (tp->t_flags & TF_SACK_PERMIT) EXIT_FASTRECOVERY(tp); - - if ((tp->t_flags & TF_RECURSE) == 0) { - tp->t_flags |= TF_RECURSE; + /* + * Only call tcp_output if we haven't already called it + * previously on the stack. + */ + if ((tp->t_flags & TF_RECURSED) == 0) { + tp->t_flags |= TF_RECURSED; tcp_output_send(tp); - tp->t_flags &= ~TF_RECURSE; + tp->t_flags &= ~TF_RECURSED; } return (inp); Modified: user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h Fri Nov 14 02:11:11 2008 (r184951) +++ user/kmacy/HEAD_fast_multi_xmit/sys/netinet/tcp_var.h Fri Nov 14 02:11:57 2008 (r184952) @@ -127,7 +127,7 @@ struct tcpcb { #define TF_ECN_PERMIT 0x4000000 /* connection ECN-ready */ #define TF_ECN_SND_CWR 0x8000000 /* ECN CWR in queue */ #define TF_ECN_SND_ECE 0x10000000 /* ECN ECE in queue */ -#define TF_RECURSE 0x20000000 /* potentially recursing in tcp_output */ +#define TF_RECURSED 0x20000000 /* single-bit counter for tcp_output */ tcp_seq snd_una; /* send unacknowledged */ tcp_seq snd_max; /* highest sequence number sent;