summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/os
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/os')
-rw-r--r--usr/src/uts/common/os/ip_cksum.c8
-rw-r--r--usr/src/uts/common/os/strsubr.c4
2 files changed, 2 insertions, 10 deletions
diff --git a/usr/src/uts/common/os/ip_cksum.c b/usr/src/uts/common/os/ip_cksum.c
index 722c793b79..1fa1c9425b 100644
--- a/usr/src/uts/common/os/ip_cksum.c
+++ b/usr/src/uts/common/os/ip_cksum.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
/* Copyright (c) 1990 Mentat Inc. */
@@ -93,9 +93,6 @@ ip_cksum(mblk_t *mp, int offset, uint_t sum)
#endif
ASSERT(dp);
- TRACE_2(TR_FAC_IP, TR_IP_CKSUM_START,
- "ip_cksum_start:%p (%X)", mp, sum);
-
if (mp->b_cont == NULL) {
/*
* May be fast-path, only one mblk.
@@ -277,9 +274,6 @@ slow1:
mlen = mp->b_wptr - (uchar_t *)w;
}
- TRACE_2(TR_FAC_IP, TR_IP_CKSUM_START,
- "ip_cksum_start:%p (%X)", mp, sum)
-
mp = mp->b_cont;
if (mlen > 0 && pmlen == -1) {
/*
diff --git a/usr/src/uts/common/os/strsubr.c b/usr/src/uts/common/os/strsubr.c
index 76ce1af025..22bdc86e03 100644
--- a/usr/src/uts/common/os/strsubr.c
+++ b/usr/src/uts/common/os/strsubr.c
@@ -8474,9 +8474,7 @@ hcksum_retrieve(mblk_t *mp, multidata_t *mmd, pdesc_t *pd,
ASSERT(DB_TYPE(mp) == M_DATA || DB_TYPE(mp) == M_MULTIDATA);
if (mp->b_datap->db_type == M_DATA) {
if (flags != NULL) {
- *flags = DB_CKSUMFLAGS(mp) & (HCK_IPV4_HDRCKSUM |
- HCK_PARTIALCKSUM | HCK_FULLCKSUM |
- HCK_FULLCKSUM_OK);
+ *flags = DB_CKSUMFLAGS(mp) & HCK_FLAGS;
if ((*flags & (HCK_PARTIALCKSUM |
HCK_FULLCKSUM)) != 0) {
if (value != NULL)