diff -r -u /tmp/846623/libibverbs-1.1.4/Makefile.am libibverbs-1.1.4/Makefile.am

--- /tmp/846623/libibverbs-1.1.4/Makefile.am	Thu Feb  3 01:53:17 2011

+++ libibverbs-1.1.4/Makefile.am	Fri Feb 11 04:02:12 2011

@@ -4,13 +4,13 @@

 AM_CFLAGS = -g -Wall -D_GNU_SOURCE

-src_libibverbs_la_CFLAGS = $(AM_CFLAGS) -DIBV_CONFIG_DIR=\"$(sysconfdir)/libibverbs.d\"

+src_libibverbs_la_CFLAGS = $(AM_CFLAGS) -DIBV_CONFIG_DIR=\"$(datadir)/libibverbs.d\"

 libibverbs_version_script = @LIBIBVERBS_VERSION_SCRIPT@

 src_libibverbs_la_SOURCES = src/cmd.c src/compat-1_0.c src/device.c src/init.c \

 			    src/marshall.c src/memory.c src/sysfs.c src/verbs.c \

-			    src/enum_strs.c

+			    src/enum_strs.c src/solaris_compatibility.c

 src_libibverbs_la_LDFLAGS = -version-info 1 -export-dynamic \

     $(libibverbs_version_script)

 src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map

@@ -37,7 +37,7 @@

 libibverbsinclude_HEADERS = include/infiniband/arch.h include/infiniband/driver.h \

     include/infiniband/kern-abi.h include/infiniband/opcode.h include/infiniband/verbs.h \

-    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h

+    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h include/infiniband/ofa_solaris.h

 man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1	\

     man/ibv_rc_pingpong.1 man/ibv_uc_pingpong.1 man/ibv_ud_pingpong.1	\

@@ -65,6 +65,7 @@

 EXTRA_DIST = include/infiniband/driver.h include/infiniband/kern-abi.h \

     include/infiniband/opcode.h include/infiniband/verbs.h include/infiniband/marshall.h \

+	 include/infiniband/ofa_solaris.h \

     include/infiniband/sa-kern-abi.h include/infiniband/sa.h \

     src/ibverbs.h examples/pingpong.h \

     src/libibverbs.map libibverbs.spec.in $(man_MANS)

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_get_device_name.3 libibverbs-1.1.4/man/ibv_get_device_name.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_get_device_name.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_get_device_name.3	Mon Mar 28 03:11:46 2011

@@ -2,7 +2,7 @@

 .\"

 .TH IBV_GET_DEVICE_NAME 3  2006-10-31 libibverbs "Libibverbs Programmer's Manual"

 .SH "NAME"

-ibv_get_device_name \- get an RDMA device's name

+ibv_get_device_name \- get an InfiniBand device's name

 .SH "SYNOPSIS"

 .nf

 .B #include <infiniband/verbs.h>

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

 .fi

 .SH "DESCRIPTION"

 .B ibv_get_device_name()

-returns a human-readable name associated with the RDMA device

+returns a human-readable name associated with the InfiniBand device

 .I device\fR.

 .SH "RETURN VALUE"

 .B ibv_get_device_name()

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_attach_mcast.3 libibverbs-1.1.4/man/ibv_attach_mcast.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_attach_mcast.3	Thu Mar 10 06:58:21 2011

+++ libibverbs-1.1.4/man/ibv_attach_mcast.3	Tue May  3 13:50:06 2011

@@ -38,9 +38,6 @@

 .SH "NOTES"

 Only QPs of Transport Service Type

 .BR IBV_QPT_UD

-or

-.BR IBV_QPT_RAW_PACKET

-may be attached to multicast groups.

 .PP

 If a QP is attached to the same multicast group multiple times, the QP will still receive a single copy of a multicast message.

 .PP

@@ -48,22 +45,6 @@

 multicast group must be sent to the subnet administrator (SA), so that

 the fabric's multicast routing is configured to deliver messages to

 the local port.

-.SH EXAMPLE

-	An example of the use of ibv_attach_mcast with RAW ETH QP:

-.nf

-

-	union ibv_gid mgid;

-

-	memset(&mgid, 0, sizeof(union ibv_gid));

-

-	memcpy(&mgid.raw[10], mmac, 6);

-

-	if (ibv_attach_mcast(qp, &mgid, 0)) {

-		printf ("Failed to attach qp to mcast. Errno: %d\\n",errno);

-		return 1;

-	}

-.fi

-

 .SH "SEE ALSO"

 .BR ibv_create_qp (3)

 .SH "AUTHORS"

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_modify_qp.3 libibverbs-1.1.4/man/ibv_modify_qp.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_modify_qp.3	Thu Mar 10 06:58:21 2011

+++ libibverbs-1.1.4/man/ibv_modify_qp.3	Tue May  3 13:50:06 2011

@@ -161,7 +161,7 @@

 .fi

 .PP

 .nf

-For QP Transport Service Type \fB IBV_QPT_RAW_PACKET\fR:

+For QP Transport Service Type:

 .sp

 Next state     Required attributes

 \-\-\-\-\-\-\-\-\-\-     \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_devinfo.1 libibverbs-1.1.4/man/ibv_devinfo.1

--- /tmp/846623/libibverbs-1.1.4/man/ibv_devinfo.1	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_devinfo.1	Mon Mar 28 03:11:46 2011

@@ -1,7 +1,7 @@

 .TH IBV_DEVINFO 1 "August 30, 2005" "libibverbs" "USER COMMANDS"

 .SH NAME

-ibv_devinfo \- query RDMA devices

+ibv_devinfo \- query InfiniBand devices

 .SH SYNOPSIS

 .B ibv_devinfo

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

 .SH DESCRIPTION

 .PP

-Print information about RDMA devices available for use from userspace.

+Print information about InfiniBand devices available for use from userspace.

 .SH OPTIONS

@@ -22,10 +22,10 @@

 query port \fIPORT\fR (default all ports)

 \fB\-l\fR, \fB\-\-list\fR

-only list names of RDMA devices

+only list names of InfiniBand devices

 \fB\-v\fR, \fB\-\-verbose\fR

-print all available information about RDMA devices

+print all available information about InfiniBand devices

 .SH SEE ALSO

 .BR ibv_devices (1)

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_query_qp.3 libibverbs-1.1.4/man/ibv_query_qp.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_query_qp.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_query_qp.3	Mon Mar 28 03:11:47 2011

@@ -68,7 +68,7 @@

 The argument

 .I attr_mask

 is a hint that specifies the minimum list of attributes to retrieve.

-Some RDMA devices may return extra attributes not requested, for

+Some InfiniBand devices may return extra attributes not requested, for

 example if the value can be returned cheaply. This has the same

 form as in

 .B ibv_modify_qp()\fR.

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_get_device_guid.3 libibverbs-1.1.4/man/ibv_get_device_guid.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_get_device_guid.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_get_device_guid.3	Mon Mar 28 03:11:46 2011

@@ -2,7 +2,7 @@

 .\"

 .TH IBV_GET_DEVICE_GUID 3 2006-10-31 libibverbs "Libibverbs Programmer's Manual"

 .SH "NAME"

-ibv_get_device_guid \- get an RDMA device's GUID

+ibv_get_device_guid \- get an InfiniBand device's GUID

 .SH "SYNOPSIS"

 .nf

 .B #include <infiniband/verbs.h>

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

 .fi

 .SH "DESCRIPTION"

 .B ibv_get_device_name()

-returns the Global Unique IDentifier (GUID) of the RDMA device

+returns the Global Unique IDentifier (GUID) of the InfiniBand device

 .I device\fR.

 .SH "RETURN VALUE"

 .B ibv_get_device_guid()

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_alloc_pd.3 libibverbs-1.1.4/man/ibv_alloc_pd.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_alloc_pd.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_alloc_pd.3	Mon Mar 28 03:11:45 2011

@@ -13,7 +13,7 @@

 .fi

 .SH "DESCRIPTION"

 .B ibv_alloc_pd()

-allocates a PD for the RDMA device context 

+allocates a PD for the InfiniBand device context 

 .I context\fR.

 .PP

 .B ibv_dealloc_pd()

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_get_async_event.3 libibverbs-1.1.4/man/ibv_get_async_event.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_get_async_event.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_get_async_event.3	Mon Mar 28 03:11:46 2011

@@ -14,7 +14,7 @@

 .fi

 .SH "DESCRIPTION"

 .B ibv_get_async_event()

-waits for the next async event of the RDMA device context

+waits for the next async event of the InfiniBand device context

 .I context

 and returns it through the pointer

 .I event\fR,

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_get_device_list.3 libibverbs-1.1.4/man/ibv_get_device_list.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_get_device_list.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_get_device_list.3	Mon Mar 28 03:11:46 2011

@@ -2,7 +2,7 @@

 .\"

 .TH IBV_GET_DEVICE_LIST 3 2006-10-31 libibverbs "Libibverbs Programmer's Manual"

 .SH "NAME"

-ibv_get_device_list, ibv_free_device_list \- get and release list of available RDMA devices

+ibv_get_device_list, ibv_free_device_list \- get and release list of available InfiniBand devices

 .SH "SYNOPSIS"

 .nf

 .B #include <infiniband/verbs.h>

@@ -13,7 +13,7 @@

 .fi

 .SH "DESCRIPTION"

 .B ibv_get_device_list()

-returns a NULL-terminated array of RDMA devices currently available.

+returns a NULL-terminated array of InfiniBand devices currently available.

 The argument

 .I num_devices

 is optional; if not NULL, it is set to the number of devices returned in the array.

@@ -25,7 +25,7 @@

 .B ibv_get_device_list()\fR.

 .SH "RETURN VALUE"

 .B ibv_get_device_list()

-returns the array of available RDMA devices, or sets

+returns the array of available InfiniBand devices, or sets

 .I errno

 and returns NULL if the request fails. If no devices are found then

 .I num_devices

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_query_device.3 libibverbs-1.1.4/man/ibv_query_device.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_query_device.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_query_device.3	Mon Mar 28 03:11:47 2011

@@ -2,7 +2,7 @@

 .\"

 .TH IBV_QUERY_DEVICE 3 2006-10-31 libibverbs "Libibverbs Programmer's Manual"

 .SH "NAME"

-ibv_query_device \- query an RDMA device's attributes

+ibv_query_device \- query an InfiniBand device's attributes

 .SH "SYNOPSIS"

 .nf

 .B #include <infiniband/verbs.h>

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_query_port.3 libibverbs-1.1.4/man/ibv_query_port.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_query_port.3	Thu Mar 10 06:58:21 2011

+++ libibverbs-1.1.4/man/ibv_query_port.3	Mon Mar 28 03:11:47 2011

@@ -2,7 +2,7 @@

 .\"

 .TH IBV_QUERY_PORT 3 2006-10-31 libibverbs "Libibverbs Programmer's Manual"

 .SH "NAME"

-ibv_query_port \- query an RDMA port's attributes

+ibv_query_port \- query an InfiniBand port's attributes

 .SH "SYNOPSIS"

 .nf

 .B #include <infiniband/verbs.h>

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_asyncwatch.1 libibverbs-1.1.4/man/ibv_asyncwatch.1

--- /tmp/846623/libibverbs-1.1.4/man/ibv_asyncwatch.1	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_asyncwatch.1	Mon Mar 28 03:11:45 2011

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

 .SH DESCRIPTION

 .PP

-Display asynchronous events forwarded to userspace for an RDMA device.

+Display asynchronous events forwarded to userspace for an InfiniBand device.

 .SH AUTHORS

 .TP

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_open_device.3 libibverbs-1.1.4/man/ibv_open_device.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_open_device.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_open_device.3	Mon Mar 28 03:11:46 2011

@@ -2,7 +2,7 @@

 .\"

 .TH IBV_OPEN_DEVICE 3 2006-10-31 libibverbs "Libibverbs Programmer's Manual"

 .SH "NAME"

-ibv_open_device, ibv_close_device \- open and close an RDMA device context

+ibv_open_device, ibv_close_device \- open and close an InfiniBand device context

 .SH "SYNOPSIS"

 .nf

 .B #include <infiniband/verbs.h>

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_create_comp_channel.3 libibverbs-1.1.4/man/ibv_create_comp_channel.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_create_comp_channel.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_create_comp_channel.3	Mon Mar 28 03:11:45 2011

@@ -15,7 +15,7 @@

 .fi

 .SH "DESCRIPTION"

 .B ibv_create_comp_channel()

-creates a completion event channel for the RDMA device context

+creates a completion event channel for the InfiniBand device context

 .I context\fR.

 .PP

 .B ibv_destroy_comp_channel()

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_create_cq.3 libibverbs-1.1.4/man/ibv_create_cq.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_create_cq.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_create_cq.3	Mon Mar 28 03:11:45 2011

@@ -18,7 +18,7 @@

 .B ibv_create_cq()

 creates a completion queue (CQ) with at least

 .I cqe

-entries for the RDMA device context

+entries for the InfiniBand device context

 .I context\fR.

 The pointer

 .I cq_context

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_devices.1 libibverbs-1.1.4/man/ibv_devices.1

--- /tmp/846623/libibverbs-1.1.4/man/ibv_devices.1	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_devices.1	Mon Mar 28 03:11:45 2011

@@ -1,7 +1,7 @@

 .TH IBV_DEVICES 1 "August 30, 2005" "libibverbs" "USER COMMANDS"

 .SH NAME

-ibv_devices \- list RDMA devices

+ibv_devices \- list InfiniBand devices

 .SH SYNOPSIS

 .B ibv_devices

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

 .SH DESCRIPTION

 .PP

-List RDMA devices available for use from userspace.

+List InfiniBand devices available for use from userspace.

 .SH SEE ALSO

 .BR ibv_devinfo (1)

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_create_qp.3 libibverbs-1.1.4/man/ibv_create_qp.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_create_qp.3	Thu Mar 10 06:58:21 2011

+++ libibverbs-1.1.4/man/ibv_create_qp.3	Tue May  3 13:50:06 2011

@@ -28,7 +28,7 @@

 struct ibv_cq          *recv_cq;        /* CQ to be associated with the Receive Queue (RQ) */

 struct ibv_srq         *srq;            /* SRQ handle if QP is to be associated with an SRQ, otherwise NULL */

 struct ibv_qp_cap       cap;            /* QP capabilities */

-enum ibv_qp_type        qp_type;        /* QP Transport Service Type: IBV_QPT_RC, IBV_QPT_UC, IBV_QPT_UD, IBV_QPT_XRC or IBV_QPT_RAW_PACKET */

+enum ibv_qp_type        qp_type;        /* QP Transport Service Type: IBV_QPT_RC, IBV_QPT_UC, IBV_QPT_UD, IBV_QPT_XRC */

 int                     sq_sig_all;     /* If set, each Work Request (WR) submitted to the SQ generates a completion entry */

 struct ibv_xrc_domain  *xrc_domain;     /* XRC domain the QP will be associated with (valid only for IBV_QPT_XRC QP), otherwise NULL */

 .in -8

diff -r -u /tmp/846623/libibverbs-1.1.4/man/ibv_create_ah_from_wc.3 libibverbs-1.1.4/man/ibv_create_ah_from_wc.3

--- /tmp/846623/libibverbs-1.1.4/man/ibv_create_ah_from_wc.3	Thu Mar 10 04:51:46 2011

+++ libibverbs-1.1.4/man/ibv_create_ah_from_wc.3	Mon Mar 28 03:11:45 2011

@@ -21,7 +21,7 @@

 .B ibv_init_ah_from_wc()

 initializes the address handle (AH) attribute structure

 .I ah_attr

-for the RDMA device context

+for the InfiniBand device context

 .I context

 using the port number

 .I port_num\fR,

diff -r -u /tmp/846623/libibverbs-1.1.4/src/kern_abi.h libibverbs-1.1.4/src/kern_abi.h

--- /tmp/846623/libibverbs-1.1.4/src/kern_abi.h	Wed Sep 16 04:27:22 2009

+++ libibverbs-1.1.4/src/kern_abi.h	Fri Feb 11 04:02:32 2011

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

 #ifndef KERN_ABI_H

 #define KERN_ABI_H

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

 #include <linux/types.h>

+#else

+#include <infiniband/ofa_solaris.h>

+#endif

 /*

  * Increment this value if any changes that break userspace ABI

diff -r -u /tmp/846623/libibverbs-1.1.4/src/verbs.c libibverbs-1.1.4/src/verbs.c

--- /tmp/846623/libibverbs-1.1.4/src/verbs.c	Thu Feb  3 01:53:17 2011

+++ libibverbs-1.1.4/src/verbs.c	Fri Feb 11 04:02:33 2011

@@ -41,6 +41,11 @@

 #include <stdlib.h>

 #include <errno.h>

 #include <string.h>

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

+#include <fcntl.h>

+#include <sys/stat.h>

+#include <sys/sysmacros.h>

+#endif

 #include "ibverbs.h"

@@ -93,6 +98,44 @@

 int __ibv_query_gid(struct ibv_context *context, uint8_t port_num,

 		    int index, union ibv_gid *gid)

 {

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

+	struct ibv_query_gid          cmd;

+	struct ibv_query_gid_resp     resp;

+

+	/*

+	 * Not exported via sysfs, use uverbs command.

+	 */

+	if (!context || !gid || (index < 0)) 

+		return -1;

+

+	if (port_num & 0x80) {

+		if (!index) 

+			return -1;

+

+		IBV_INIT_CMD_RESP(&cmd, sizeof cmd, QUERY_GID, gid,

+		    sizeof (union ibv_gid) * index);

+

+		cmd.gid_index = index;

+		cmd.port_num  = port_num;

+

+		if (write(context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)

+			return -1;

+		else

+			return 0;

+	} else {

+		IBV_INIT_CMD_RESP(&cmd, sizeof cmd, QUERY_GID, &resp,

+		    sizeof resp);

+

+		cmd.gid_index = index;

+		cmd.port_num  = port_num;

+

+		if (write(context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)

+			return -1;

+

+		memcpy(gid, resp.gid, sizeof resp.gid);	

+		return 0;

+	}

+#else

 	char name[24];

 	char attr[41];

 	uint16_t val;

@@ -112,6 +155,7 @@

 	}

 	return 0;

+#endif

 }

 default_symver(__ibv_query_gid, ibv_query_gid);

@@ -118,6 +162,44 @@

 int __ibv_query_pkey(struct ibv_context *context, uint8_t port_num,

 		     int index, uint16_t *pkey)

 {

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

+	struct ibv_query_pkey         cmd;

+	struct ibv_query_pkey_resp    resp;

+

+	/*

+	 * Not exported via sysfs, use uverbs command.

+	 */

+	if (!context || !pkey || (index < 0)) 

+		return -1;

+

+	if (port_num & 0x80) {

+		IBV_INIT_CMD_RESP(&cmd, sizeof cmd, QUERY_PKEY, pkey,

+		    sizeof (uint16_t) * index);

+

+		if (!index)

+			 return -1;

+		cmd.pkey_index = index;

+		cmd.port_num   = port_num;

+

+		if (write(context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)

+			return -1;

+		else

+			return 0;

+	} else {

+

+		IBV_INIT_CMD_RESP(&cmd, sizeof cmd, QUERY_PKEY, &resp,

+		    sizeof resp);

+

+		cmd.pkey_index = index;

+		cmd.port_num   = port_num;

+

+		if (write(context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)

+			return -1;

+

+		*pkey = resp.pkey;

+		return 0;

+	}

+#else

 	char name[24];

 	char attr[8];

 	uint16_t val;

@@ -133,6 +215,7 @@

 	*pkey = htons(val);

 	return 0;

+#endif

 }

 default_symver(__ibv_query_pkey, ibv_query_pkey);

@@ -212,6 +295,10 @@

 	struct ibv_comp_channel            *channel;

 	struct ibv_create_comp_channel      cmd;

 	struct ibv_create_comp_channel_resp resp;

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

+	int		event_fd;

+	struct stat	fstat_buf;

+#endif

 	if (abi_ver <= 2)

 		return ibv_create_comp_channel_v2(context);

@@ -221,7 +308,23 @@

 		return NULL;

 	IBV_INIT_CMD_RESP(&cmd, sizeof cmd, CREATE_COMP_CHANNEL, &resp, sizeof resp);

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

+	event_fd = open("/dev/infiniband/ofs/uverbs:event", O_RDWR);

+	if (event_fd < 0) {

+		free(channel);

+		return NULL;

+	}

+

+	if (fstat(event_fd, &fstat_buf)) {

+		free(channel);

+		return NULL;

+	}

+	resp.fd = minor(fstat_buf.st_rdev);

+#endif

 	if (write(context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd) {

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

+		close(event_fd);

+#endif

 		free(channel);

 		return NULL;

 	}

@@ -228,6 +331,9 @@

 	VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp);

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

+	resp.fd = event_fd;

+#endif

 	channel->context = context;

 	channel->fd      = resp.fd;

 	channel->refcnt  = 0;

diff -r -u /tmp/846623/libibverbs-1.1.4/src/device.c libibverbs-1.1.4/src/device.c

--- /tmp/846623/libibverbs-1.1.4/src/device.c	Thu Feb  3 01:53:17 2011

+++ libibverbs-1.1.4/src/device.c	Fri Feb 11 04:02:31 2011

@@ -128,8 +128,13 @@

 	int cmd_fd;