diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-01-10 12:03:54 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-01-10 12:03:54 -0500 |
| commit | 2624119bc7eee06bb2da3bb1be2b60a4bcc0e325 (patch) | |
| tree | 128c04571ae480d6bfe6f55b4a8f8b946440420b /usr/src/uts/common/inet/tcp/tcp.c | |
| parent | a6c17ee4cf858d7e9986ca14e81201186076dc12 (diff) | |
| parent | 1b2ec6d6cf3fc8870f15f0100929dfde15fb32c6 (diff) | |
| download | illumos-joyent-2624119bc7eee06bb2da3bb1be2b60a4bcc0e325.tar.gz | |
[illumos-gate merge]
commit 1b2ec6d6cf3fc8870f15f0100929dfde15fb32c6
12264 halt: unused label
commit 861fa1490335b8e3cc91a1efafd8b9e481813931
14017 Add support for TCP_QUICKACK
commit 5608cf052f6eabe370f15f49b6fa5d0d8be732af
14335 nscd: this 'if' clause does not guard...
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index 88d558fd10..427a6df274 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -25,6 +25,7 @@ * Copyright (c) 2013, 2017 by Delphix. All rights reserved. * Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. * Copyright 2020 Joyent, Inc. + * Copyright 2022 Oxide Computer Company */ /* Copyright (c) 1990 Mentat Inc. */ @@ -2420,6 +2421,7 @@ tcp_init_values(tcp_t *tcp, tcp_t *parent) tcp->tcp_fin_wait_2_flush_interval = parent->tcp_fin_wait_2_flush_interval; + tcp->tcp_quickack = parent->tcp_quickack; tcp->tcp_ka_interval = parent->tcp_ka_interval; tcp->tcp_ka_abort_thres = parent->tcp_ka_abort_thres; |