upstream/oracle/userland-gate: changeset 5790:9ae20789c796

author	boris.chiu@oracle.com
	Fri, 15 Apr 2016 10:18:28 -0700
changeset 5790	9ae20789c796
parent 5789	5183fa4a46ce
child 5791	08bbb1f1f01f

23102715 infiniband-diags fails to build on s12-97 (nightly)

--- a/components/open-fabrics/infiniband-diags/solaris_set_nodedesc.c	Fri Apr 15 10:08:22 2016 -0700
+++ b/components/open-fabrics/infiniband-diags/solaris_set_nodedesc.c	Fri Apr 15 10:18:28 2016 -0700
@@ -59,7 +59,7 @@
  * building on build system without the change in
  * header files.
  */
-#ifndef	UVERBS_IOCTL_GET_NODEDESC
+#ifndef	UVERBS_NODEDESC_UPDATE_STRING
 #define	UVERBS_IOCTL_GET_NODEDESC		('v' << 8) | 0x04
 #define	UVERBS_IOCTL_SET_NODEDESC		('v' << 8) | 0x05
 #define	UVERBS_NODEDESC_UPDATE_STRING		0x00000001