diff options
| author | Robert Mustacchi <rm@joyent.com> | 2018-03-28 23:20:07 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2018-04-02 16:52:13 +0000 |
| commit | 9dc0f5536a83ce4ef09e0009beec208ac83f0a75 (patch) | |
| tree | e27546e6376142b460df5081c90a7ebd09859472 /usr/src/uts/common/inet/ip/ip_output.c | |
| parent | 51e13f4784dca9f0e910f3d0fb85b659ad68ceb2 (diff) | |
| download | illumos-joyent-netperf.tar.gz | |
OS-XXXX wip vxlan lsonetperf
Diffstat (limited to 'usr/src/uts/common/inet/ip/ip_output.c')
| -rw-r--r-- | usr/src/uts/common/inet/ip/ip_output.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/uts/common/inet/ip/ip_output.c b/usr/src/uts/common/inet/ip/ip_output.c index 690f39e0dc..05c9115e03 100644 --- a/usr/src/uts/common/inet/ip/ip_output.c +++ b/usr/src/uts/common/inet/ip/ip_output.c @@ -1721,13 +1721,6 @@ ip_output_cksum_v4(iaflags_t ixaflags, mblk_t *mp, ipha_t *ipha, } /* - * If we've been asked to skip the ULP checksum, then just let IP do its - * business. - */ - if ((ixa->ixa_flags & IXAF_SKIP_ULP_CKSUM) != 0) - goto ip_hdr_cksum; - - /* * Calculate ULP checksum. Note that we don't use cksump and cksum * if the ill has FULL support. */ @@ -1795,6 +1788,14 @@ ip_output_cksum_v4(iaflags_t ixaflags, mblk_t *mp, ipha_t *ipha, can_partial = (hck_flags & HCKSUM_INET_PARTIAL) != 0; } DB_CKSUMFLAGS(mp) &= ~HCK_OUTER_FLAGS; + + if ((ixa->ixa_flags & IXAF_SKIP_ULP_CKSUM) != 0 && can_inet) { + DB_CKSUMFLAGS(mp) |= HCK_IPV4_HDRCKSUM; + *cksump = 0; + ipha->ipha_hdr_checksum = 0; + return (B_TRUE); + } + if (can_full) { /* * Hardware calculates pseudo-header, header and the |