Date: Fri, 14 Nov 2008 02:11:57 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184952 - user/kmacy/HEAD_fast_multi_xmit/sys/netinet Message-ID: <200811140211.mAE2BvIe075736@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811140211.mAE2BvIe075736>