diff -r -u /tmp/librdmacm-1.0.14.1/configure librdmacm-1.0.14.1/configure

--- /tmp/librdmacm-1.0.14.1/configure	Tue Feb 15 17:12:14 2011

+++ librdmacm-1.0.14.1/configure	Thu Feb 24 08:39:24 2011

@@ -7625,6 +7625,7 @@

  	esac ;;

       esac

       link_all_deplibs=yes

+      hardcode_libdir_flag_spec=

       ;;

     sunos4*)

diff -r -u /tmp/librdmacm-1.0.14.1/Makefile.in librdmacm-1.0.14.1/Makefile.in

--- /tmp/librdmacm-1.0.14.1/Makefile.in	Tue Feb 15 17:12:13 2011

+++ librdmacm-1.0.14.1/Makefile.in	Mon Mar 28 16:49:13 2011

@@ -69,7 +69,7 @@

 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \

 	"$(DESTDIR)$(man7dir)" "$(DESTDIR)$(infinibandincludedir)" \

 	"$(DESTDIR)$(librdmacmincludedir)"

-libLTLIBRARIES_INSTALL = $(INSTALL)

+libLTLIBRARIES_INSTALL = $(INSTALL) -m 755

 LTLIBRARIES = $(lib_LTLIBRARIES)

 src_librdmacm_la_LIBADD =

 am_src_librdmacm_la_OBJECTS = src_librdmacm_la-cma.lo \

@@ -76,7 +76,7 @@

 	src_librdmacm_la-addrinfo.lo src_librdmacm_la-acm.lo

 src_librdmacm_la_OBJECTS = $(am_src_librdmacm_la_OBJECTS)

 am__dirstamp = $(am__leading_dot)dirstamp

-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -m 755

 PROGRAMS = $(bin_PROGRAMS)

 am_examples_mckey_OBJECTS = mckey.$(OBJEXT)

 examples_mckey_OBJECTS = $(am_examples_mckey_OBJECTS)

diff -r -u /tmp/librdmacm-1.0.14.1/src/cma.h librdmacm-1.0.14.1/src/cma.h

--- /tmp/librdmacm-1.0.14.1/src/cma.h	Mon Oct  4 17:00:18 2010

+++ librdmacm-1.0.14.1/src/cma.h	Fri Feb 11 04:08:57 2011

@@ -40,8 +40,10 @@

 #include <stdlib.h>

 #include <errno.h>

+#if !(defined(__SVR4) && defined(__sun))

 #include <endian.h>

 #include <byteswap.h>

+#endif

 #include <rdma/rdma_cma.h>

@@ -58,14 +60,6 @@

 #define PFX "librdmacm: "

-#if __BYTE_ORDER == __LITTLE_ENDIAN

-static inline uint64_t htonll(uint64_t x) { return bswap_64(x); }

-static inline uint64_t ntohll(uint64_t x) { return bswap_64(x); }

-#else

-static inline uint64_t htonll(uint64_t x) { return x; }

-static inline uint64_t ntohll(uint64_t x) { return x; }

-#endif

-

 #define min(a, b) (a < b ? a : b)

 static inline int ERR(int err)

diff -r -u /tmp/librdmacm-1.0.14.1/src/cma.c librdmacm-1.0.14.1/src/cma.c

--- /tmp/librdmacm-1.0.14.1/src/cma.c	Fri Dec 10 12:05:34 2010

+++ librdmacm-1.0.14.1/src/cma.c	Mon Mar 28 16:44:55 2011

@@ -46,12 +46,18 @@

 #include <poll.h>

 #include <unistd.h>

 #include <pthread.h>

+#if defined(__SVR4) && defined(__sun)

+#include <sys/stat.h>

+#include <sys/mkdev.h>

+#else

 #include <endian.h>

 #include <byteswap.h>

+#endif

 #include <stddef.h>

 #include <netdb.h>

 #include "cma.h"

+#include <infiniband/arch.h>

 #include <infiniband/driver.h>

 #include <infiniband/marshall.h>

 #include <rdma/rdma_cma.h>

 	if (!channel)

 		return NULL;

+#if defined(__SVR4) && defined(__sun)

+	channel->fd = open("/dev/infiniband/ofs/rdma_cm", O_RDWR);

+#else

 	channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR);

+#endif

+

 	if (channel->fd < 0) {

+#if defined(__SVR4) && defined(__sun)

+		printf("CMA: unable to open /dev/infiniband/ofs/rdma_cm\n");

+#else

 		printf("CMA: unable to open /dev/infiniband/rdma_cm\n");

+#endif

 		goto err;

 	}

 	return channel;

 	if (ret)

 		return ret;

+#if defined(__SVR4) && defined(__sun)

+	qp_init_attr->sq_sig_all |= LIB_RDMACM_QP_BIT;

+#endif

+

 	qp = ibv_create_qp(pd, qp_init_attr);

 	if (!qp) {

 		ret = ERR(ENOMEM);

 	CMA_CREATE_MSG_CMD(msg, cmd, UCMA_CMD_ACCEPT, size);

 	cmd->id = id_priv->handle;

+#if defined(__SVR4) && defined(__sun)

+	cmd->conn_param.qp_num = ((id_priv->id).qp)->qp_num;

+#endif

 	ret = write(id_priv->id.channel->fd, msg, size);

 	if (ret != size) {

 	CMA_CREATE_MSG_CMD_RESP(msg, cmd, resp, UCMA_CMD_MIGRATE_ID, size);

 	cmd->id = id_priv->handle;

+

+#if !(defined(__SVR4) && defined(__sun))

 	cmd->fd = id->channel->fd;

+#else

+	{

+		struct stat	fstat_buf;

+		int		rc;

+		if ((rc = fstat(id->channel->fd, &fstat_buf)) != 0)

+			return (ERR(ENODATA));

+		cmd->fd = minor(fstat_buf.st_rdev);

+	}

+#endif

+

 	ret = write(channel->fd, msg, size);

 	if (ret != size)

 		return (ret >= 0) ? ERR(ENODATA) : -1;

diff -r -u /tmp/librdmacm-1.0.14.1/man/rdma_create_id.3 librdmacm-1.0.14.1/man/rdma_create_id.3

--- /tmp/librdmacm-1.0.14.1/man/rdma_create_id.3	Mon Oct  4 17:00:18 2010

+++ librdmacm-1.0.14.1/man/rdma_create_id.3	Mon Mar 28 03:11:48 2011

@@ -31,9 +31,7 @@

 explicitly binding to a specified RDMA device before communication

 can occur, and most operations are asynchronous in nature.  Asynchronous

 communication events on an rdma_cm_id are reported through the associated

-event channel.  If the channel parameter is NULL, the rdma_cm_id will

-be placed into synchronous operation.  While operating synchronously,

-calls that result in an event will block until the operation completes.

+event channel.

 The event will be returned to the user through the rdma_cm_id structure,

 and be available for access until another rdma_cm call is made.

 .P

diff -r -u /tmp/librdmacm-1.0.14.1/man/rdma_create_qp.3 librdmacm-1.0.14.1/man/rdma_create_qp.3

--- /tmp/librdmacm-1.0.14.1/man/rdma_create_qp.3	Fri Dec 10 12:05:34 2010

+++ librdmacm-1.0.14.1/man/rdma_create_qp.3	Mon Mar 28 03:11:48 2011

@@ -33,8 +33,7 @@

 the rdma_cm_id will be created using a default protection domain.  One

 default protection domain is allocated per RDMA device.

 .P

-The initial QP attributes are specified by the qp_init_attr parameter.  The

-send_cq and recv_cq fields in the ibv_qp_init_attr are optional.  If

+The initial QP attributes are specified by the qp_init_attr parameter.  If

 a send or receive completion queue is not specified, then a CQ will be

 allocated by the rdma_cm for the QP, along with corresponding completion

 channels.  Completion channels and CQ data created by the rdma_cm are

diff -r -u /tmp/librdmacm-1.0.14.1/man/rdma_cm.7 librdmacm-1.0.14.1/man/rdma_cm.7

--- /tmp/librdmacm-1.0.14.1/man/rdma_cm.7	Mon Oct  4 17:00:18 2010

+++ librdmacm-1.0.14.1/man/rdma_cm.7	Mon Mar 28 03:11:47 2011

@@ -19,7 +19,7 @@

 API defined by the libibverbs library.  The libibverbs library provides the

 underlying interfaces needed to send and receive data.

 .P

-The RDMA CM can operate asynchronously or synchronously.  The mode of

+The RDMA CM operates asynchronously.  The mode of

 operation is controlled by the user through the use of the rdma_cm event channel

 parameter in specific calls.  If an event channel is provided, an rdma_cm identifier

 will report its event data (results of connecting, for example), on that channel.

@@ -63,12 +63,7 @@

 .SH "CLIENT OPERATION"

 This section provides a general overview of the basic operation for the active,

 or client, side of communication.  This flow assume asynchronous operation with

-low level call details shown.  For

-synchronous operation, calls to rdma_create_event_channel, rdma_get_cm_event,

-rdma_ack_cm_event, and rdma_destroy_event_channel

-would be eliminated.  Abstracted calls, such as rdma_create_ep encapsulate

-serveral of these calls under a single API.

-Users may also refer to the example applications for

+low level call details shown.  Users may also refer to the example applications for

 code samples.  A general connection flow would be:

 .IP rdma_getaddrinfo

 retrieve address information of the destination

@@ -178,12 +173,9 @@

 rdma_ack_cm_event(3),

 rdma_bind_addr(3),

 rdma_connect(3),

-rdma_create_ep(3),

 rdma_create_event_channel(3),

 rdma_create_id(3),

 rdma_create_qp(3),

-rdma_dereg_mr(3),

-rdma_destroy_ep(3),

 rdma_destroy_event_channel(3),

 rdma_destroy_id(3),

 rdma_destroy_qp(3),

@@ -196,27 +188,11 @@

 rdma_get_dst_port(3),

 rdma_get_local_addr(3),

 rdma_get_peer_addr(3),

-rdma_get_recv_comp(3),

-rdma_get_request(3),

-rdma_get_send_comp(3),

 rdma_get_src_port(3),

 rdma_join_multicast(3),

 rdma_leave_multicast(3),

 rdma_listen(3),

-rdma_migrate_id(3),

 rdma_notify(3),

-rdma_post_read(3)

-rdma_post_readv(3),

-rdma_post_recv(3),

-rdma_post_recvv(3),

-rdma_post_send(3),

-rdma_post_sendv(3),

-rdma_post_ud_send(3),

-rdma_post_write(3),

-rdma_post_writev(3),

-rdma_reg_msgs(3),

-rdma_reg_read(3),

-rdma_reg_write(3),

 rdma_reject(3),

 rdma_resolve_addr(3),

 rdma_resolve_route(3),

diff -r -u /tmp/librdmacm-1.0.14.1/include/infiniband/ib.h librdmacm-1.0.14.1/include/infiniband/ib.h

--- /tmp/librdmacm-1.0.14.1/include/infiniband/ib.h	Mon Oct  4 17:00:18 2010

+++ librdmacm-1.0.14.1/include/infiniband/ib.h	Fri Feb 11 04:08:56 2011

@@ -33,7 +33,11 @@

 #if !defined(_RDMA_IB_H)

 #define _RDMA_IB_H

+#if !(defined(__SVR4) && defined(__sun))

 #include <linux/types.h>

+#else