diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-08 11:41:12 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-04-08 11:41:12 +0000 |
| commit | 6b564a7014af2d4d9f000ed39a4fed77fd5245e0 (patch) | |
| tree | 3805c7d1cab7ee8faf746ed3a1f0d1a448d4a8da /usr/src/uts/common/inet/tcp/tcp.c | |
| parent | 4fc8237742a380d4833394892fb148e1a34acb28 (diff) | |
| parent | 62366fbbe8edca853fee6c14327d822239ba914f (diff) | |
| download | illumos-joyent-release-20200409.tar.gz | |
[illumos-gate merge]release-20200409
commit 62366fbbe8edca853fee6c14327d822239ba914f
12466 Enable IPv6 TSO Support for vioif
commit d240edaf609c558d5a1f981b09a577823b54fae2
12465 vioif needs length for tso checksum
commit 425251fd07ab465313fb50dea0f1ac795be10e05
9059 Simplify SMAP relocations with krtld
commit 28e0ac9c914344194ef919b0271895d33f83d396
12433 efcode: NULL pointer errors
commit 31aa620247ae407b2bee2dccd71693d1938f54d6
12452 Want support for AMD Zen 2 CPC Events
Conflicts:
usr/src/uts/i86pc/os/machdep.c
usr/src/uts/common/io/dld/dld_proto.c
usr/src/uts/common/inet/ip/ip_if.c
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index ef4c96db1c..554fe8b78f 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -3332,9 +3332,11 @@ tcp_update_lso(tcp_t *tcp, ip_xmit_attr_t *ixa) */ if (ixa->ixa_flags & IXAF_LSO_CAPAB) { ill_lso_capab_t *lsoc = &ixa->ixa_lso_capab; + uint_t lso_max = (ixa->ixa_flags & IXAF_IS_IPV4) ? + lsoc->ill_lso_max_tcpv4 : lsoc->ill_lso_max_tcpv6; - ASSERT(lsoc->ill_lso_max > 0); - tcp->tcp_lso_max = MIN(TCP_MAX_LSO_LENGTH, lsoc->ill_lso_max); + ASSERT3U(lso_max, >, 0); + tcp->tcp_lso_max = MIN(TCP_MAX_LSO_LENGTH, lso_max); DTRACE_PROBE3(tcp_update_lso, boolean_t, tcp->tcp_lso, boolean_t, B_TRUE, uint32_t, tcp->tcp_lso_max); |