Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 10 deletions

diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
index cbb822e8d791..2d0191c90f9e 100644
--- a/include/rdma/iw_cm.h
+++ b/include/rdma/iw_cm.h
@@ -46,18 +46,9 @@ enum iw_cm_event_type {
         IW_CM_EVENT_CLOSE                /* close complete */
 };
 
-enum iw_cm_event_status {
-        IW_CM_EVENT_STATUS_OK = 0,       /* request successful */
-        IW_CM_EVENT_STATUS_ACCEPTED = 0, /* connect request accepted */
-        IW_CM_EVENT_STATUS_REJECTED,     /* connect request rejected */
-        IW_CM_EVENT_STATUS_TIMEOUT,      /* the operation timed out */
-        IW_CM_EVENT_STATUS_RESET,        /* reset from remote peer */
-        IW_CM_EVENT_STATUS_EINVAL,       /* asynchronous failure for bad parm */
-};
-
 struct iw_cm_event {
         enum iw_cm_event_type event;
-        enum iw_cm_event_status status;
+        int                      status;
         struct sockaddr_in local_addr;
         struct sockaddr_in remote_addr;
         void *private_data;