diff options
| author | Roamer <Roamer@Sun.COM> | 2010-01-11 21:01:02 -0800 |
|---|---|---|
| committer | Roamer <Roamer@Sun.COM> | 2010-01-11 21:01:02 -0800 |
| commit | 1908fb0e6a43a40b10543e14d9fcf29c75f182d7 (patch) | |
| tree | 3d9be545a0f6e67b1cb48ee6dae1c1e73c80e55b /usr/src/uts/common/inet/tcp/tcp.c | |
| parent | 71b428bebcb3bd69d99d304083ab5f83cbd41bbe (diff) | |
| download | illumos-gate-1908fb0e6a43a40b10543e14d9fcf29c75f182d7.tar.gz | |
6910514 TCP might send down non-LSO packets with LSO flags
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index 81fa835e3e..e1c1c60dc1 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -16588,10 +16588,8 @@ tcp_send(tcp_t *tcp, const int mss, const int total_hdr_len, ixa->ixa_flags &= ~IXAF_REACH_CONF; } - /* - * Append LSO information, both flags and mss, to the mp. - */ if (do_lso_send) { + /* Append LSO information to the mp. */ lso_info_set(mp, mss, HW_LSO); ixa->ixa_fragsize = IP_MAXPACKET; ixa->ixa_extra_ident = num_lso_seg - 1; @@ -16610,6 +16608,12 @@ tcp_send(tcp_t *tcp, const int mss, const int total_hdr_len, TCP_STAT(tcps, tcp_lso_times); TCP_STAT_UPDATE(tcps, tcp_lso_pkt_out, num_lso_seg); } else { + /* + * Make sure to clean up LSO information. Wherever a + * new mp uses the prepended header room after dupb(), + * lso_info_cleanup() should be called. + */ + lso_info_cleanup(mp); tcp_send_data(tcp, mp); BUMP_LOCAL(tcp->tcp_obsegs); } |