diff options
| author | Sebastien Roy <sebastien.roy@delphix.com> | 2014-11-20 10:43:59 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2014-11-21 17:25:13 -0500 |
| commit | 633fc3a6eed35d918db16925b7048d7a2e28064a (patch) | |
| tree | 9c455583c4aab62de63bbb5ceb6b4f31f3f12ca8 /usr/src/uts/common/inet/tcp/tcp_input.c | |
| parent | b607c8a3bdb27d4fde6e3fc4bb6617a1d91bdca7 (diff) | |
| download | illumos-joyent-633fc3a6eed35d918db16925b7048d7a2e28064a.tar.gz | |
5295 remove maxburst logic from TCP's send algorithm
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: Gordon Ross <gordon.ross@nexenta.com>
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp_input.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp_input.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp_input.c b/usr/src/uts/common/inet/tcp/tcp_input.c index b98eb33a46..45337d83d9 100644 --- a/usr/src/uts/common/inet/tcp/tcp_input.c +++ b/usr/src/uts/common/inet/tcp/tcp_input.c @@ -23,6 +23,7 @@ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 Joyent, Inc. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ /* This file contains all TCP input processing functions. */ @@ -2644,8 +2645,6 @@ tcp_input_data(void *arg, mblk_t *mp, void *arg2, ip_recv_attr_t *ira) tcp->tcp_rexmit = B_FALSE; tcp->tcp_rexmit_nxt = tcp->tcp_snxt; tcp->tcp_rexmit_max = tcp->tcp_snxt; - tcp->tcp_snd_burst = tcp->tcp_localnet ? - TCP_CWND_INFINITE : TCP_CWND_NORMAL; tcp->tcp_ms_we_have_waited = 0; /* @@ -3840,8 +3839,6 @@ process_ack: tcp->tcp_rexmit = B_FALSE; tcp->tcp_rexmit_nxt = tcp->tcp_snxt; tcp->tcp_rexmit_max = tcp->tcp_snxt; - tcp->tcp_snd_burst = tcp->tcp_localnet ? - TCP_CWND_INFINITE : TCP_CWND_NORMAL; tcp->tcp_ms_we_have_waited = 0; tcp->tcp_cwnd = mss; } @@ -4010,15 +4007,6 @@ process_ack: } /* - * Do not allow bursty traffic during. - * fast recovery. Refer to Fall and Floyd's - * paper "Simulation-based Comparisons of - * Tahoe, Reno and SACK TCP" (in CCR?) - * This is a best current practise. - */ - tcp->tcp_snd_burst = TCP_CWND_SS; - - /* * For SACK: * Calculate tcp_pipe, which is the * estimated number of bytes in @@ -4218,8 +4206,6 @@ process_ack: } tcp->tcp_rexmit_max = seg_ack; tcp->tcp_cwnd_cnt = 0; - tcp->tcp_snd_burst = tcp->tcp_localnet ? - TCP_CWND_INFINITE : TCP_CWND_NORMAL; /* * Remove all notsack info to avoid confusion with @@ -4280,8 +4266,6 @@ process_ack: } else { tcp->tcp_rexmit = B_FALSE; tcp->tcp_rexmit_nxt = tcp->tcp_snxt; - tcp->tcp_snd_burst = tcp->tcp_localnet ? - TCP_CWND_INFINITE : TCP_CWND_NORMAL; } tcp->tcp_ms_we_have_waited = 0; } |