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 = @[email protected]

 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_post_send.3 libibverbs-1.1.4/man/ibv_post_send.3

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

+++ libibverbs-1.1.4/man/ibv_post_send.3	Tue Nov 13 10:04:25 2012

@@ -91,14 +91,17 @@

 The attribute send_flags describes the properties of the \s-1WR\s0. It is either 0 or the bitwise \s-1OR\s0 of one or more of the following flags:

 .PP

 .TP

-.B IBV_SEND_FENCE \fR Set the fence indicator.  Valid only for QPs with Transport Service Type \fBIBV_QPT_RC

+.B IBV_SEND_FENCE \fR

+Set the fence indicator.  Valid only for QPs with Transport Service Type \fBIBV_QPT_RC

 .TP

-.B IBV_SEND_SIGNALED \fR Set the completion notification indicator.  Relevant only if QP was created with sq_sig_all=0

+.B IBV_SEND_SIGNALED \fR

+Set the completion notification indicator.  Relevant only if QP was created with sq_sig_all=0

 .TP

-.B IBV_SEND_SOLICITED \fR Set the solicited event indicator.  Valid only for Send and RDMA Write with immediate

+.B IBV_SEND_SOLICITED \fR

+Set the solicited event indicator.  Valid only for Send and RDMA Write with immediate

 .TP

-.B IBV_SEND_INLINE \fR Send data in given gather list as inline data

-in a send WQE.  Valid only for Send and RDMA Write.  The L_Key will not be checked.

+.B IBV_SEND_INLINE \fR

+Send data in given gather list as inline data in a send WQE.  Valid only for Send and RDMA Write.  The L_Key will not be checked.

 .SH "RETURN VALUE"

 .B ibv_post_send()

 returns 0 on success, or the value of errno on failure (which indicates the failure reason).

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,

@@ -29,6 +29,8 @@

 struct ibv_qp  *qp;             /* QP that got the event */

 struct ibv_srq *srq;            /* SRQ that got the event */

 int             port_num;       /* port number that got the event */

+uint32_t        xrc_qp_num;     /* XRC QP that got the event */

+union ibv_gid   gid;            /* list of guids that got the event */

 .in -8

 } element;

 enum ibv_event_type     event_type;     /* type of the event */

@@ -86,6 +88,16 @@

 .TP

 .B IBV_EVENT_DEVICE_FATAL \fR CA is in FATAL state

 .PP

+.I Subnet events:

+.TP

+.B IBV_SM_EVENT_MCG_CREATED \fR notification of MCG creation

+.TP

+.B IBV_SM_EVENT_MCG_DELETED \fR notification of MCG deletion

+.TP

+.B IBV_SM_EVENT_GID_AVAIL \fR notification of GID available events

+.TP

+.B IBV_SM_EVENT_GID_UNAVAIL \fR notification of GID unavailable events

+.PP

 .B ibv_ack_async_event()

 acknowledge the async event

 .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

@@ -1,16 +1,78 @@

-.TH IBV_ASYNCWATCH 1 "August 30, 2005" "libibverbs" "USER COMMANDS"

+'\" te

+.TH IBV_ASYNCWATCH 1 "August 8, 2012" "libibverbs" "USER COMMANDS"

 .SH NAME

 ibv_asyncwatch \- display asynchronous events

 .SH SYNOPSIS

-.B ibv_asyncwatch

-

+.sp

+.nf

+\fIibv_asyncwatch\fR [\-G | \-M] [\-s[<guid>]] [\-p port]

+\fIibv_asyncwactch\fR \-s

+\fIibv_asyncwatch\fR \-G \-s

+\fIibv_asyncwatch\fR \-M \-s

+\fIibv_asyncwatch\fR \-G [\-p port] \-s<guid1>,<guid2>,...

+\fIibv_asyncwatch\fR \-M [\-p port] \-s<mgid1>,<mgid2>,...

+.fi

+.sp

 .SH DESCRIPTION

 .PP

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

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

+SM events can be monitored using the '-s' option, which optionally

+takes a remote port GUID, or list of remote port GUIDS separated by ','.

+If '-s' is specified with no argument then all remote nodes reachable

+form device 0 are monitored, otherwise only the specified remote

+nodes are monitored. The following SM events are monitored using

+the '-s' option: 

-.SH AUTHORS

-.TP

-Roland Dreier

-.RI < [email protected] >

+    IBV_SM_EVENT_MCG_CREATED

+         An MCG specified by the "mgid" has been created

+         on this subnet.

+

+    IBV_SM_EVENT_MCG_DELETED

+         The MCG specified by the "mgid" has been deleted

+         on this subnet.

+

+    IBV_SM_EVENT_GID_AVAIL

+         The GID specified by the "guid" is available

+         on this subnet.

+

+    IBV_SM_EVENT_GID_UNAVAIL

+         The GID specified by the "guid" is no longer

+         available on this subnet.

+

+.SH OPTIONS

+.pp

+\-G               Monitor SM event for Unicast GIDs

+.sp

+.pp

+\-M               Monitor SM event for Multicast GIDs

+.pp

+\-s<GUID>         Takes as an optional argument a comma separated list of remote port GUIDs if \-G is specified or Multicast GIDs if \-M is specified.

+.sp

+.PP

+\-p <port>        use the specified ca_port.

+.sp

+.pp

+.SH EXAMPLES

+.PP

+To monitor event=IBV_SM_EVENT_ALL

+.sp

+ibv_asyncwatch -s

+.sp

+To monitor event=IBV_SM_EVENT_UGID_ALL

+.sp

+ibv_asyncwatch -G -s

+.sp

+To monitor event=IBV_SM_EVENT_MGID_ALL

+.sp

+ibv_asyncwatch -M -s

+.sp

+To monitor event=IBV_SM_EVENT_UGID

+.sp

+ibv_asyncwatch -G -s0x0021280001a0e4d9,0x0021280001a0e4da

+.sp

+To monitor event=IBV_SM_EVENT_MGID

+.sp

+ibv_asyncwatch -M -s0xff12:4001:ffff::c:2238

+.sp

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,8 +8,37 @@

 .SH DESCRIPTION

 .PP

-List RDMA devices available for use from userspace.

+List InfiniBand devices available for use from userspace.

+On SR-IOV capable systems, if a domain is configured with

+VFs (Virtual Function), ibv_devices lists for each IB device

+the node GUID and the type (PF or VF).  In this case, the PF

+devices are displayed before the VF devices.  The following

+shows the results of running ibv_devices on a domain with

+one PF and two VFs:

+

+    device                 node GUID            type

+    ------              ----------------        ----

+    mlx4_2              00212800013f3126         PF

+    mlx4_0              00212d00013f3126         VF

+    mlx4_1              00212900013f3126         VF

+

+If all of the IB devices are PFs, only node GUIDs are

+listed.  The following shows the results of running

+ibv_devices on a domain with one PF and no VFs:

+

+    device                 node GUID

+    ------              ----------------

+    mlx4_0              00212800013f3126

+

+On systems which are not SR-IOV capable only node GUIDs are

+listed.

+

+    device                 node GUID

+    ------              ----------------

+    mlx4_0              0021280001a0e4d8

+    mlx4_1              0021280001a0e754

+

 .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