Refresh of errno

diff --git a/trunk/ulp/dapl2/dapl/openib_cma/SOURCES b/trunk/ulp/dapl2/dapl/openib_cma/SOURCES
index d6b97a2d1c05463361871c212df9f1ec0838a2e7..0c3764bb3f93e210e1a5bab8be3ada480ba58948 100644 (file)
--- a/trunk/ulp/dapl2/dapl/openib_cma/SOURCES
+++ b/trunk/ulp/dapl2/dapl/openib_cma/SOURCES
@@ -25,7 +25,7 @@ SOURCES = \
        cm.c\r
 \r
 INCLUDES = ..\include;..\openib_common;..\common;windows;..\..\dat\include;\\r
-                  ..\..\dat\udat\windows;..\udapl\windows;\\r
+                  ..\..\dat\udat\windows;..\udapl\windows;..\..\..\..\inc\user\linux;\\r
                   ..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\libibverbs\include;\\r
                   ..\..\..\librdmacm\include\r
 \r

diff --git a/trunk/ulp/dapl2/dapl/openib_scm/SOURCES b/trunk/ulp/dapl2/dapl/openib_scm/SOURCES
index 6e4ad30cc03c46a31bef9375fc79e5a622b64e7c..2129e2771773cc15a60af93ac8172d8e9529246e 100644 (file)
--- a/trunk/ulp/dapl2/dapl/openib_scm/SOURCES
+++ b/trunk/ulp/dapl2/dapl/openib_scm/SOURCES
@@ -25,7 +25,7 @@ SOURCES = \
         cm.c\r
 \r
 INCLUDES = ..\include;..\openib_common\;..\common;windows;..\..\dat\include;\\r
-                  ..\..\dat\udat\windows;..\udapl\windows;\\r
+                  ..\..\dat\udat\windows;..\udapl\windows;..\..\..\..\inc\user\linux;\\r
                   ..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\libibverbs\include\r
 \r
 DAPL_OPTS = -DEXPORT_DAPL_SYMBOLS -DDAT_EXTENSIONS -DSOCK_CM -DOPENIB -DCQ_WAIT_OBJECT\r

diff --git a/trunk/ulp/libibverbs/examples/asyncwatch/SOURCES b/trunk/ulp/libibverbs/examples/asyncwatch/SOURCES
index f8c7c854a2adf3811a3906a8d14bfd053c399171..c62d745abb3799be26120c9edc89737732fec73f 100644 (file)
--- a/trunk/ulp/libibverbs/examples/asyncwatch/SOURCES
+++ b/trunk/ulp/libibverbs/examples/asyncwatch/SOURCES
@@ -14,7 +14,8 @@ SOURCES =                     \
        asyncwatch.rc   \\r
        asyncwatch.c\r
        \r
-INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\r
+INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\\r
+                       ..\..\..\..\inc\user\linux\r
 \r
 TARGETLIBS =                                           \\r
        $(SDK_LIB_PATH)\kernel32.lib    \\r

diff --git a/trunk/ulp/libibverbs/examples/rc_pingpong/SOURCES b/trunk/ulp/libibverbs/examples/rc_pingpong/SOURCES
index 8de70ed489ca172a619447a2cf7cc2801d636376..e4d74d6e52da6b07033a5af438370444b7c24477 100644 (file)
--- a/trunk/ulp/libibverbs/examples/rc_pingpong/SOURCES
+++ b/trunk/ulp/libibverbs/examples/rc_pingpong/SOURCES
@@ -14,7 +14,8 @@ SOURCES =                     \
        rc_pingpong.rc  \\r
        rc_pingpong.c\r
        \r
-INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\r
+INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\\r
+                  ..\..\..\..\inc\user\linux\r
 \r
 TARGETLIBS =                                           \\r
        $(SDK_LIB_PATH)\kernel32.lib    \\r

diff --git a/trunk/ulp/libibverbs/examples/uc_pingpong/SOURCES b/trunk/ulp/libibverbs/examples/uc_pingpong/SOURCES
index c84ae84c3b6aa216fc8c611c5762f83ec2f98e99..463261f1048a781c4578484eb1c244b485d82cc9 100644 (file)
--- a/trunk/ulp/libibverbs/examples/uc_pingpong/SOURCES
+++ b/trunk/ulp/libibverbs/examples/uc_pingpong/SOURCES
@@ -14,7 +14,8 @@ SOURCES =                     \
        uc_pingpong.rc  \\r
        uc_pingpong.c\r
        \r
-INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\r
+INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\\r
+                  ..\..\..\..\inc\user\linux\r
 \r
 TARGETLIBS =                                           \\r
        $(SDK_LIB_PATH)\kernel32.lib    \\r

diff --git a/trunk/ulp/libibverbs/examples/ud_pingpong/SOURCES b/trunk/ulp/libibverbs/examples/ud_pingpong/SOURCES
index 5cdce283289514432fc0a810569208a90e25d165..b52779488521c50e543236d8c9d00b37bccc3c64 100644 (file)
--- a/trunk/ulp/libibverbs/examples/ud_pingpong/SOURCES
+++ b/trunk/ulp/libibverbs/examples/ud_pingpong/SOURCES
@@ -14,7 +14,8 @@ SOURCES =                     \
        ud_pingpong.rc  \\r
        ud_pingpong.c\r
        \r
-INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\r
+INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\\r
+                  ..\..\..\..\inc\user\linux\r
 \r
 TARGETLIBS =                                           \\r
        $(SDK_LIB_PATH)\kernel32.lib    \\r

diff --git a/trunk/ulp/libibverbs/include/infiniband/verbs.h b/trunk/ulp/libibverbs/include/infiniband/verbs.h
index 91e568420d38dd6c39e953713a836b293a5cfab3..25584e5927559cf1079ccb30c9a7e545faaea36c 100644 (file)
--- a/trunk/ulp/libibverbs/include/infiniband/verbs.h
+++ b/trunk/ulp/libibverbs/include/infiniband/verbs.h
@@ -1125,7 +1125,7 @@ __declspec(dllexport)
 void ibvw_release_windata(struct ibvw_windata *windata, int version);\r
 \r
 __declspec(dllexport)\r
-int ibvw_errno(HRSULT hr);\r
+int ibvw_wv_errno(HRESULT hr);\r
 \r
 #ifdef __cplusplus\r
 }\r

diff --git a/trunk/ulp/libibverbs/src/ibv_exports.src b/trunk/ulp/libibverbs/src/ibv_exports.src
index e9a8a8338ae8dd73a0c6813b97fafb6b4df4eb4f..48fc8bc26a69e769f12aea2b8e9cce387ffe77cb 100644 (file)
--- a/trunk/ulp/libibverbs/src/ibv_exports.src
+++ b/trunk/ulp/libibverbs/src/ibv_exports.src
@@ -53,5 +53,5 @@ ibv_port_state_str
 ibv_event_type_str\r
 ibvw_get_windata\r
 ibvw_release_windata\r
-ibvw_errno\r
+ibvw_wv_errno\r
 #endif\r

diff --git a/trunk/ulp/libibverbs/src/ibv_main.cpp b/trunk/ulp/libibverbs/src/ibv_main.cpp
index ca292a686eb0dae99c036dd2d2836c08fcefea99..c6f4b73fc059549fce769e12f8da51d992ac64ce 100644 (file)
--- a/trunk/ulp/libibverbs/src/ibv_main.cpp
+++ b/trunk/ulp/libibverbs/src/ibv_main.cpp
@@ -28,6 +28,8 @@
  */\r
 \r
 #include <windows.h>\r
+#include <rdma/wvstatus.h>\r
+#include <_errno.h>\r
 \r
 extern CRITICAL_SECTION lock;\r
 HANDLE heap;\r
@@ -55,34 +57,3 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 \r
        return TRUE;\r
 }\r
-\r
-__declspec(dllexport)\r
-int ibvw_wv_errno(HRSULT hr)\r
-{\r
-       switch (hr) {\r
-       case WV_SUCCESS:                        return 0;\r
-       case WV_PENDING:                        _set_errno(EINPROGRESS); break;\r
-       case WV_IO_PENDING:                     _set_errno(EINPROGRESS); break;\r
-       case WV_TIMEOUT:                        _set_errno(ETIMEDOUT); break;\r
-       case WV_BUFFER_OVERFLOW:        _set_errno(EOVERFLOW); break;\r
-       case WV_DEVICE_BUSY:            _set_errno(EBUSY); break;\r
-       case WV_ACCESS_VIOLATION:       _set_errno(EACCES); break;\r
-       case WV_INVALID_HANDLE:         _set_errno(EINVAL); break;\r
-       case WV_INVALID_PARAMETER:      _set_errno(EINVAL); break;\r
-       case WV_NO_MEMORY:                      _set_errno(ENOMEM); break;\r
-       case WV_INSUFFICIENT_RESOURCES: _set_errno(ENOSPC); break;\r
-       case WV_IO_TIMEOUT:                     _set_errno(ETIMEDOUT); break;\r
-       case WV_NOT_SUPPORTED:          _set_errno(ENOSYS); break;\r
-       case WV_CANCELLED:                      _set_errno(ECANCELED); break\r
-       case WV_INVALID_ADDRESS:        _set_errno(EADDRNOTAVAIL); break;\r
-       case WV_ADDRESS_ALREADY_EXISTS: _set_errno(EADDRINUSE); break;\r
-       case WV_CONNECTION_REFUSED:     _set_errno(ECONNREFUSED); break;\r
-       case WV_CONNECTION_INVALID:     _set_errno(ENOTCONN); break;\r
-       case WV_CONNECTION_ACTIVE:      _set_errno(EISCONN); break;\r
-       case WV_HOST_UNREACHABLE:       _set_errno(ENETUNREACH); break;\r
-       case WV_CONNECTION_ABORTED:     _set_errno(ECONNABORTED); break;\r
-       case WV_REMOTE_OP_ERROR:        _set_errno(EREMOTEIO); break;\r
-       case WV_UNKNOWN_ERROR:          _set_errno(EIO); break;\r
-       }\r
-       return -1;\r
-}\r

diff --git a/trunk/ulp/libibverbs/src/verbs.cpp b/trunk/ulp/libibverbs/src/verbs.cpp
index fe2df60ebd12777bc133692ea4133050e7d4258c..8aa407de56b55478c99e70bc3997ab46227b54da 100644 (file)
--- a/trunk/ulp/libibverbs/src/verbs.cpp
+++ b/trunk/ulp/libibverbs/src/verbs.cpp
@@ -140,7 +140,7 @@ int ibv_query_device(struct ibv_context *context,
 \r
        hr = context->cmd_if->Query(&attr);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        sprintf(device_attr->fw_ver, "0x%I64x", attr.FwVersion);\r
@@ -208,7 +208,7 @@ int ibv_query_port(struct ibv_context *context, uint8_t port_num,
        \r
        hr = context->cmd_if->QueryPort(port_num, &attr);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        port_attr->state = (enum ibv_port_state) attr.State;\r
@@ -238,14 +238,14 @@ __declspec(dllexport)
 int ibv_query_gid(struct ibv_context *context, uint8_t port_num,\r
                                  int index, union ibv_gid *gid)\r
 {\r
-       return ibvw_errno(context->cmd_if->QueryGid(port_num, index, (WV_GID *) gid));\r
+       return ibvw_wv_errno(context->cmd_if->QueryGid(port_num, index, (WV_GID *) gid));\r
 }\r
 \r
 __declspec(dllexport)\r
 int ibv_query_pkey(struct ibv_context *context, uint8_t port_num,\r
                                   int index, uint16_t *pkey)\r
 {\r
-       return ibvw_errno(context->cmd_if->QueryPkey(port_num, (UINT16) index, pkey));\r
+       return ibvw_wv_errno(context->cmd_if->QueryPkey(port_num, (UINT16) index, pkey));\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -311,7 +311,7 @@ int ibv_dereg_mr(struct ibv_mr *mr)
        if (SUCCEEDED(hr)) {\r
                delete mr;\r
        }\r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -386,7 +386,7 @@ int ibv_resize_cq(struct ibv_cq *cq, int cqe)
        if (SUCCEEDED(hr)) {\r
                cq->cqe = (int) entries;\r
        }\r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -407,7 +407,7 @@ int ibv_req_notify_cq(struct ibv_cq *cq, int solicited_only)
        } else {\r
                hr = 0;\r
        }\r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -506,7 +506,7 @@ int ibv_modify_srq(struct ibv_srq *srq,
                attr.srq_limit = srq_attr->srq_limit;\r
        }\r
 \r
-       return ibvw_errno(srq->handle->Modify(attr.max_wr, attr.srq_limit));\r
+       return ibvw_wv_errno(srq->handle->Modify(attr.max_wr, attr.srq_limit));\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -522,7 +522,7 @@ int ibv_post_srq_recv(struct ibv_srq *srq,
                                                                          (WV_SGE *) (*bad_recv_wr)->sg_list,\r
                                                                          (*bad_recv_wr)->num_sge);\r
        }\r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -533,7 +533,7 @@ int ibv_query_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr)
 \r
        hr = srq->handle->Query(&max_wr, &max_sge, &srq_limit);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        srq_attr->max_wr = (uint32_t) max_wr;\r
@@ -626,7 +626,7 @@ int ibv_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
 \r
        hr = qp->handle->Query(&wv_attr);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        /* ibv_qp exposes qp_num.  Save qp_num from query. */\r
@@ -725,7 +725,7 @@ int ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
                qp->state = attr->qp_state;\r
        }\r
 \r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -737,7 +737,7 @@ int ibv_post_send(struct ibv_qp *qp, struct ibv_send_wr *wr,
        struct ibv_ah *ah;\r
 \r
        if ((qp->qp_type == IBV_QPT_UD) && (wr->next != NULL))\r
-               return ibvw_errno(WV_NOT_SUPPORTED);\r
+               return ibvw_wv_errno(WV_NOT_SUPPORTED);\r
 \r
        for (cur_wr = wr; cur_wr != NULL; cur_wr = cur_wr->next) {\r
                if (qp->qp_type == IBV_QPT_UD) {\r
@@ -778,7 +778,7 @@ int ibv_post_send(struct ibv_qp *qp, struct ibv_send_wr *wr,
                }\r
        }\r
 \r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -791,7 +791,7 @@ int ibv_post_recv(struct ibv_qp *qp, struct ibv_recv_wr *wr,
                hr = qp->handle->PostReceive((*bad_wr)->wr_id, (WV_SGE *) (*bad_wr)->sg_list,\r
                                                                         (*bad_wr)->num_sge);\r
        }\r
-       return ibvw_errno(hr);\r
+       return ibvw_wv_errno(hr);\r
 }\r
 \r
 __declspec(dllexport)\r
@@ -890,11 +890,41 @@ int ibv_destroy_ah(struct ibv_ah *ah)
 __declspec(dllexport)\r
 int ibv_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)\r
 {\r
-       return ibvw_errno(qp->ud_handle->AttachMulticast((WV_GID *) gid, lid, NULL));\r
+       return ibvw_wv_errno(qp->ud_handle->AttachMulticast((WV_GID *) gid, lid, NULL));\r
 }\r
 \r
 __declspec(dllexport)\r
 int ibv_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)\r
 {\r
-       return ibvw_errno(qp->ud_handle->DetachMulticast((WV_GID *) gid, lid, NULL));\r
+       return ibvw_wv_errno(qp->ud_handle->DetachMulticast((WV_GID *) gid, lid, NULL));\r
+}\r
+\r
+__declspec(dllexport)\r
+int ibvw_wv_errno(HRESULT hr)\r
+{\r
+       switch (hr) {\r
+       case WV_SUCCESS:                        return 0;\r
+       case WV_PENDING:                        _set_errno(EINPROGRESS); break;\r
+       case WV_IO_PENDING:                     _set_errno(EINPROGRESS); break;\r
+       case WV_TIMEOUT:                        _set_errno(ETIMEDOUT); break;\r
+       case WV_BUFFER_OVERFLOW:        _set_errno(EOVERFLOW); break;\r
+       case WV_DEVICE_BUSY:            _set_errno(EBUSY); break;\r
+       case WV_ACCESS_VIOLATION:       _set_errno(EACCES); break;\r
+       case WV_INVALID_HANDLE:         _set_errno(EINVAL); break;\r
+       case WV_INVALID_PARAMETER:      _set_errno(EINVAL); break;\r
+       case WV_NO_MEMORY:                      _set_errno(ENOMEM); break;\r
+       case WV_INSUFFICIENT_RESOURCES: _set_errno(ENOSPC); break;\r
+       case WV_IO_TIMEOUT:                     _set_errno(ETIMEDOUT); break;\r
+       case WV_NOT_SUPPORTED:          _set_errno(ENOSYS); break;\r
+       case WV_CANCELLED:                      _set_errno(ECANCELED); break;\r
+       case WV_INVALID_ADDRESS:        _set_errno(EADDRNOTAVAIL); break;\r
+       case WV_ADDRESS_ALREADY_EXISTS: _set_errno(EADDRINUSE); break;\r
+       case WV_CONNECTION_REFUSED:     _set_errno(ECONNREFUSED); break;\r
+       case WV_CONNECTION_INVALID:     _set_errno(ENOTCONN); break;\r
+       case WV_CONNECTION_ACTIVE:      _set_errno(EISCONN); break;\r
+       case WV_HOST_UNREACHABLE:       _set_errno(ENETUNREACH); break;\r
+       case WV_CONNECTION_ABORTED:     _set_errno(ECONNABORTED); break;\r
+       case WV_UNKNOWN_ERROR:          _set_errno(EIO); break;\r
+       }\r
+       return -1;\r
 }\r

diff --git a/trunk/ulp/librdmacm/examples/cmatose/SOURCES b/trunk/ulp/librdmacm/examples/cmatose/SOURCES
index cfe59ff21ad4d236b2631890f6cb46ed9bb71901..396635f2305acfbfa24fef59b35e5995103b0792 100644 (file)
--- a/trunk/ulp/librdmacm/examples/cmatose/SOURCES
+++ b/trunk/ulp/librdmacm/examples/cmatose/SOURCES
@@ -12,7 +12,8 @@ USE_IOSTREAM = 1
 \r
 SOURCES = cmatose.c\r
        \r
-INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;..\..\..\libibverbs\include;\r
+INCLUDES = ..;..\..\include;..\..\..\..\inc;..\..\..\..\inc\user;\\r
+                  ..\..\..\libibverbs\include;..\..\..\..\inc\user\linux;\r
 \r
 TARGETLIBS =                                           \\r
        $(SDK_LIB_PATH)\kernel32.lib    \\r

diff --git a/trunk/ulp/librdmacm/src/Sources b/trunk/ulp/librdmacm/src/Sources
index 3a771696e0470db7bb051d63fca89b75527d7916..6a8418a0b1293ecf00264bdb8abafbf046ca12bc 100644 (file)
--- a/trunk/ulp/librdmacm/src/Sources
+++ b/trunk/ulp/librdmacm/src/Sources
@@ -21,7 +21,8 @@ SOURCES =                     \
        cma_main.cpp    \\r
        cma.cpp\r
 \r
-INCLUDES = ..\include;..\..\..\inc;..\..\..\inc\user;..\..\libibverbs\include\r
+INCLUDES = ..\include;..\..\..\inc;..\..\..\inc\user;..\..\libibverbs\include;\\r
+                  ..\..\..\inc\user\linux;\r
 \r
 USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_CMA_SYMBOLS\r
 \r

diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
index ff0b98e9bafa401b6bd3c2651111d3dc281d245a..c0db9fb57ac4834552ac35a558622c310748259f 100644 (file)
--- a/trunk/ulp/librdmacm/src/cma.cpp
+++ b/trunk/ulp/librdmacm/src/cma.cpp
@@ -270,7 +270,7 @@ int rdma_create_id(struct rdma_event_channel *channel,
                hr = windata.prov->CreateDatagramEndpoint(&id_priv->id.ep.datagram);\r
        }\r
        if (FAILED(hr)) {\r
-               ret = ibvw_errno(hr);\r
+               ret = ibvw_wv_errno(hr);\r
                goto err2;\r
        }\r
 \r
@@ -371,7 +371,7 @@ static int ucma_query_connect(struct rdma_cm_id *id, struct rdma_conn_param *par
        id_priv = CONTAINING_RECORD(id, struct cma_id_private, id);\r
        hr = id->ep.connect->Query(&attr);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        RtlCopyMemory(&id->route.addr.src_addr, &attr.LocalAddress,\r
@@ -452,14 +452,14 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
                if (SUCCEEDED(hr)) {\r
                        ret = ucma_query_connect(id, NULL);\r
                } else {\r
-                       ret = ibvw_errno(hr);\r
+                       ret = ibvw_wv_errno(hr);\r
                }\r
        } else {\r
                hr = id->ep.datagram->BindAddress(addr);\r
                if (SUCCEEDED(hr)) {\r
                        ret = ucma_query_datagram(id, NULL);\r
                } else {\r
-                       ret = ibvw_errno(hr);\r
+                       ret = ibvw_wv_errno(hr);\r
                }\r
        }\r
 \r
@@ -526,14 +526,14 @@ int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms)
        hr = IBAT::ResolvePath(&id->route.addr.src_addr, &id->route.addr.dst_addr,\r
                                                   &path, timeout_ms);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        hr = (id->ps == RDMA_PS_TCP) ?\r
                 id->ep.connect->Modify(WV_EP_OPTION_ROUTE, &path, sizeof path) :\r
                 id->ep.datagram->Modify(WV_EP_OPTION_ROUTE, &path, sizeof path);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        id_priv = CONTAINING_RECORD(id, struct cma_id_private, id);\r
@@ -557,7 +557,7 @@ static int ucma_modify_qp_init(struct cma_id_private *id_priv, struct ibv_qp *qp
                                                                           id_priv->id.route.addr.addr.ibaddr.pkey,\r
                                                                           &index);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        qp_attr.pkey_index = index;\r
@@ -674,7 +674,7 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
                id_priv->refcnt--;\r
                id->comp_entry.Busy = 0;\r
                id_priv->state = cma_route_resolve;\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        return 0;\r
@@ -688,7 +688,7 @@ static int ucma_get_request(struct cma_id_private *listen, int index)
 \r
        EnterCriticalSection(&lock);\r
        if (listen->state != cma_listening) {\r
-               ret = ibvw_errno(WV_INVALID_PARAMETER);\r
+               ret = ibvw_wv_errno(WV_INVALID_PARAMETER);\r
                goto err1;\r
        }\r
 \r
@@ -713,7 +713,7 @@ static int ucma_get_request(struct cma_id_private *listen, int index)
                                                                                                &id_priv->id.comp_entry.Overlap);\r
        }\r
        if (FAILED(hr) && hr != WV_IO_PENDING) {\r
-               ret = ibvw_errno(hr);\r
+               ret = ibvw_wv_errno(hr);\r
                id_priv->id.comp_entry.Busy = 0;\r
                id_priv->refcnt--;\r
                goto err2;\r
@@ -756,7 +756,7 @@ int rdma_listen(struct rdma_cm_id *id, int backlog)
        hr = (id->ps == RDMA_PS_TCP) ?\r
                 id->ep.connect->Listen(backlog) : id->ep.datagram->Listen(backlog);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        for (i = 0; i < backlog; i++) {\r
@@ -801,7 +801,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
                id_priv->refcnt--;\r
                id->comp_entry.Busy = 0;\r
                id_priv->state = cma_disconnected;\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        return 0;\r
@@ -818,7 +818,7 @@ int rdma_reject(struct rdma_cm_id *id, const void *private_data,
        id_priv->state = cma_disconnected;\r
        hr = id->ep.connect->Reject(private_data, private_data_len);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
        return 0;\r
 }\r
@@ -843,7 +843,7 @@ int rdma_disconnect(struct rdma_cm_id *id)
        }\r
        hr = id->ep.connect->Disconnect(NULL);\r
        if (FAILED(hr)) {\r
-               return ibvw_errno(hr);\r
+               return ibvw_wv_errno(hr);\r
        }\r
 \r
        return 0;\r
@@ -962,7 +962,7 @@ static int ucma_process_event(struct cma_event *event)
                listen = (struct cma_id_private *) id_priv->id.context;\r
                if (listen->state != cma_listening) {\r
                        InterlockedDecrement(&id_priv->refcnt);\r
-                       ret = ECANCELLED;\r
+                       ret = ECANCELED;\r
                        break;\r
                }\r
 \r
@@ -991,7 +991,7 @@ static int ucma_process_event(struct cma_event *event)
                break;\r
        default:\r
                InterlockedDecrement(&id_priv->refcnt);\r
-               ret = ECANCELLED;\r
+               ret = ECANCELED;\r
        }\r
        LeaveCriticalSection(&lock);\r
 \r
@@ -1105,3 +1105,39 @@ int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel)
        id->channel = channel;\r
        return 0;\r
 }\r
+\r
+__declspec(dllexport)\r
+int rdmaw_wsa_errno(int wsa_err)\r
+{\r
+       switch (wsa_err) {\r
+       case 0:                                 return 0;\r
+       case WSAEWOULDBLOCK:    _set_errno(EWOULDBLOCK); break;\r
+       case WSAEINPROGRESS:    _set_errno(EINPROGRESS); break;\r
+       case WSAEALREADY:               _set_errno(EALREADY); break;\r
+       case WSAENOTSOCK:               _set_errno(ENOTSOCK); break;\r
+       case WSAEDESTADDRREQ:   _set_errno(EDESTADDRREQ); break;\r
+       case WSAEMSGSIZE:               _set_errno(EMSGSIZE); break;\r
+       case WSAEPROTOTYPE:             _set_errno(EPROTOTYPE); break;\r
+       case WSAENOPROTOOPT:    _set_errno(ENOPROTOOPT); break;\r
+       case WSAEPROTONOSUPPORT:_set_errno(EPROTONOSUPPORT); break;\r
+       case WSAEOPNOTSUPP:             _set_errno(EOPNOTSUPP); break;\r
+       case WSAEAFNOSUPPORT:   _set_errno(EAFNOSUPPORT); break;\r
+       case WSAEADDRINUSE:             _set_errno(EADDRINUSE); break;\r
+       case WSAEADDRNOTAVAIL:  _set_errno(EADDRNOTAVAIL); break;\r
+       case WSAENETDOWN:               _set_errno(ENETDOWN); break;\r
+       case WSAENETUNREACH:    _set_errno(ENETUNREACH); break;\r
+       case WSAENETRESET:              _set_errno(ENETRESET); break;\r
+       case WSAECONNABORTED:   _set_errno(ECONNABORTED); break;\r
+       case WSAECONNRESET:             _set_errno(ECONNRESET); break;\r
+       case WSAENOBUFS:                _set_errno(ENOBUFS); break;\r
+       case WSAEISCONN:                _set_errno(EISCONN); break;\r
+       case WSAENOTCONN:               _set_errno(ENOTCONN); break;\r
+       case WSAETIMEDOUT:              _set_errno(ETIMEDOUT); break;\r
+       case WSAECONNREFUSED:   _set_errno(ECONNREFUSED); break;\r
+       case WSAELOOP:                  _set_errno(ELOOP); break;\r
+       case WSAENAMETOOLONG:   _set_errno(ENAMETOOLONG); break;\r
+       case WSAEHOSTUNREACH:   _set_errno(EHOSTUNREACH); break;\r
+       case WSAENOTEMPTY:              _set_errno(ENOTEMPTY); break;\r
+       }\r
+       return -1;\r
+}\r

diff --git a/trunk/ulp/librdmacm/src/cma_main.cpp b/trunk/ulp/librdmacm/src/cma_main.cpp
index ababfb8b1d56ebb680c5213a91ed52833d572d4e..0084633de9649849964ce9bb33204a56f9235045 100644 (file)
--- a/trunk/ulp/librdmacm/src/cma_main.cpp
+++ b/trunk/ulp/librdmacm/src/cma_main.cpp
@@ -56,49 +56,3 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 \r
        return TRUE;\r
 }\r
-\r
-__declspec(dllexport)\r
-int rdmaw_wsa_errno(int wsa_err)\r
-{\r
-       switch (wsa_err) {\r
-       case 0:                                 return 0;\r
-       case WSAEWOULDBLOCK             _set_errno(EWOULDBLOCK); break;\r
-       case WSAEINPROGRESS             _set_errno(EINPROGRESS); break;\r
-       case WSAEALREADY                _set_errno(EALREADY); break;\r
-       case WSAENOTSOCK                _set_errno(ENOTSOCK); break;\r
-       case WSAEDESTADDRREQ    _set_errno(EDESTADDRREQ); break;\r
-       case WSAEMSGSIZE                _set_errno(EMSGSIZE); break;\r
-       case WSAEPROTOTYPE              _set_errno(EPROTOTYPE); break;\r
-       case WSAENOPROTOOPT             _set_errno(ENOPROTOOPT); break;\r
-       case WSAEPROTONOSUPPORT _set_errno(EPROTONOSUPPORT); break;\r
-       case WSAESOCKTNOSUPPORT _set_errno(ESOCKTNOSUPPORT); break;\r
-       case WSAEOPNOTSUPP              _set_errno(EOPNOTSUPP); break;\r
-       case WSAEPFNOSUPPORT    _set_errno(EPFNOSUPPORT); break;\r
-       case WSAEAFNOSUPPORT    _set_errno(EAFNOSUPPORT); break;\r
-       case WSAEADDRINUSE              _set_errno(EADDRINUSE); break;\r
-       case WSAEADDRNOTAVAIL   _set_errno(EADDRNOTAVAIL); break;\r
-       case WSAENETDOWN                _set_errno(ENETDOWN); break;\r
-       case WSAENETUNREACH             _set_errno(ENETUNREACH); break;\r
-       case WSAENETRESET               _set_errno(ENETRESET); break;\r
-       case WSAECONNABORTED    _set_errno(ECONNABORTED); break;\r
-       case WSAECONNRESET              _set_errno(ECONNRESET); break;\r
-       case WSAENOBUFS                 _set_errno(ENOBUFS); break;\r
-       case WSAEISCONN                 _set_errno(EISCONN); break;\r
-       case WSAENOTCONN                _set_errno(ENOTCONN); break;\r
-       case WSAESHUTDOWN               _set_errno(ESHUTDOWN); break;\r
-       case WSAETOOMANYREFS    _set_errno(ETOOMANYREFS); break;\r
-       case WSAETIMEDOUT               _set_errno(ETIMEDOUT); break;\r
-       case WSAECONNREFUSED    _set_errno(ECONNREFUSED); break;\r
-       case WSAELOOP                   _set_errno(ELOOP); break;\r
-       case WSAENAMETOOLONG    _set_errno(ENAMETOOLONG); break;\r
-       case WSAEHOSTDOWN               _set_errno(EHOSTDOWN); break;\r
-       case WSAEHOSTUNREACH    _set_errno(EHOSTUNREACH); break;\r
-       case WSAENOTEMPTY               _set_errno(ENOTEMPTY); break;\r
-       case WSAEPROCLIM                _set_errno(EPROCLIM); break;\r
-       case WSAEUSERS                  _set_errno(EUSERS); break;\r
-       case WSAEDQUOT                  _set_errno(EDQUOT); break;\r
-       case WSAESTALE                  _set_errno(ESTALE); break;\r
-       case WSAEREMOTE                 _set_errno(EREMOTE); break;\r
-       }\r
-       return -1;\r
-}\r