diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/ib/clients/rdsv3/info.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/info.c b/usr/src/uts/common/io/ib/clients/rdsv3/info.c index 9a14b7d2ab..cf5930945d 100644 --- a/usr/src/uts/common/io/ib/clients/rdsv3/info.c +++ b/usr/src/uts/common/io/ib/clients/rdsv3/info.c @@ -137,7 +137,7 @@ rdsv3_info_ioctl(struct rsock *sock, int optname, char *optval, RDSV3_DPRINTF4("rdsv3_info_ioctl", "optname: %d lenp: %llx datap: %llx", optname, arg.lenp, arg.datap); - if (arg.lenp == NULL) { + if (arg.lenp == (uintptr_t)NULL) { RDSV3_DPRINTF2("rdsv3_info_ioctl", "arg.lenp is NULL"); return (EFAULT); } @@ -156,7 +156,7 @@ rdsv3_info_ioctl(struct rsock *sock, int optname, char *optval, /* a 0 len call is just trying to probe its length */ if (ulen == 0) { iter.addr = NULL; - } else if (arg.datap == NULL) { + } else if (arg.datap == (uintptr_t)NULL) { RDSV3_DPRINTF2("rdsv3_info_ioctl", "arg.datap is NULL, ulen set to: %d", ulen); return (EINVAL); diff --git a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c index 412e0a7db9..5cc3160b3a 100644 --- a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c +++ b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_impl.c @@ -69,7 +69,7 @@ ddi_taskq_t *rdsv3_taskq = NULL; extern kmem_cache_t *rdsv3_alloc_cache; -extern unsigned int ip_ocsum(ushort_t *address, int halfword_count, +extern unsigned int ip_ocsum(ushort_t *address, int halfword_count, unsigned int sum); /* @@ -81,7 +81,7 @@ rdsv3_capable_interface(struct lifreq *lifrp) char ifname[LIFNAMSIZ]; char drv[MAXLINKNAMELEN]; uint_t ppa; - char *cp; + char *cp; RDSV3_DPRINTF4("rdsv3_capable_interface", "Enter"); @@ -286,7 +286,7 @@ rdsv3_capable_interface_old(struct ifreq *ifrp) char ifname[IFNAMSIZ]; char drv[MAXLINKNAMELEN]; uint_t ppa; - char *cp; + char *cp; RDSV3_DPRINTF4("rdsv3_capable_interface_old", "Enter"); @@ -1093,7 +1093,7 @@ rdsv3_trans_init() int rdsv3_put_cmsg(struct nmsghdr *msg, int level, int type, size_t size, - void *payload) + void *payload) { struct cmsghdr *cp; char *bp; @@ -1300,13 +1300,13 @@ rdsv3_ib_free_hdrs(ib_device_t *dev, struct rdsv3_ib_connection *ic) ASSERT(ic->i_mr != NULL); ic->i_send_hdrs = NULL; - ic->i_send_hdrs_dma = NULL; + ic->i_send_hdrs_dma = 0; ic->i_recv_hdrs = NULL; - ic->i_recv_hdrs_dma = NULL; + ic->i_recv_hdrs_dma = 0; ic->i_ack = NULL; - ic->i_ack_dma = NULL; + ic->i_ack_dma = 0; (void) ibt_deregister_mr(ib_get_ibt_hca_hdl(dev), ic->i_mr->hdl); |