summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-04-28 09:21:08 +0300
committerToomas Soome <tsoome@me.com>2019-05-15 23:02:39 +0300
commit6895f6f4d5c99fd997130635c4a4bff68554bb8e (patch)
treedce2579338ee5f237ed8ffba0d717e9e542dcc76
parent0e2db3e7fce28a3f9e1dfd13abce14eac44e98c6 (diff)
downloadillumos-joyent-6895f6f4d5c99fd997130635c4a4bff68554bb8e.tar.gz
10862 mac: comparison between pointer and integer
Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/common/io/mac/mac.c4
-rw-r--r--usr/src/uts/common/io/mac/mac_hio.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/mac/mac.c b/usr/src/uts/common/io/mac/mac.c
index bba41d7cf3..cff19a9f74 100644
--- a/usr/src/uts/common/io/mac/mac.c
+++ b/usr/src/uts/common/io/mac/mac.c
@@ -5975,7 +5975,7 @@ mac_reclaim_ring_from_grp(mac_impl_t *mip, mac_ring_type_t ring_type,
if (mcip == NULL)
mcip = mac_get_grp_primary(group);
ASSERT(mcip != NULL);
- ASSERT(mcip->mci_share == NULL);
+ ASSERT(mcip->mci_share == 0);
mrp = MCIP_RESOURCE_PROPS(mcip);
if (ring_type == MAC_RING_TYPE_RX) {
@@ -7533,7 +7533,7 @@ mac_group_ring_modify(mac_client_impl_t *mcip, mac_group_t *group,
}
/* don't allow modifying rings for a share for now. */
- ASSERT(mcip->mci_share == NULL);
+ ASSERT(mcip->mci_share == 0);
if (ringcnt == group->mrg_cur_count)
return (0);
diff --git a/usr/src/uts/common/io/mac/mac_hio.c b/usr/src/uts/common/io/mac/mac_hio.c
index 100f071220..3fa270c936 100644
--- a/usr/src/uts/common/io/mac/mac_hio.c
+++ b/usr/src/uts/common/io/mac/mac_hio.c
@@ -60,7 +60,7 @@ i_mac_share_alloc(mac_client_impl_t *mcip)
i_mac_perim_enter(mip);
- ASSERT(mcip->mci_share == NULL);
+ ASSERT(mcip->mci_share == 0);
if (mac_share_capable((mac_handle_t)mcip->mci_mip) == 0) {
DTRACE_PROBE1(i__mac__share__alloc__not__sup,