Refresh of retry-ibat

diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp
index 2dfcff1ab77cc013348ff6a8e4b002ebccfcd68a..ede0a5ee19cc19878b479423f3f170f61a50c38a 100644 (file)
--- a/trunk/core/ibat/user/ibat.cpp
+++ b/trunk/core/ibat/user/ibat.cpp
@@ -358,6 +358,9 @@ Resolve(
     return S_OK;\r
 }\r
 \r
+#endif // WINVER >= 0x600\r
+\r
+\r
 HRESULT\r
 ResolvePath(\r
     __in const struct sockaddr* pSrcAddr,\r
@@ -379,8 +382,7 @@ ResolvePath(
        return hr;\r
 }\r
 \r
-#endif\r
-}\r
+} /* IBAT namespace */\r
 \r
 extern "C"\r
 {\r

diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp
index 9205c56f44e29dc3d3297665a1d84f121ac74fdf..40e741136b9a0f2e4be8859024593033c69b21b7 100644 (file)
--- a/trunk/ulp/librdmacm/src/cma.cpp
+++ b/trunk/ulp/librdmacm/src/cma.cpp
@@ -514,7 +514,7 @@ int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms)
        HRESULT hr;\r
 \r
        hr = IBAT::ResolvePath(&id->route.addr.src_addr, &id->route.addr.dst_addr,\r
-                                                  path, timeout_ms);\r
+                                                  &path, timeout_ms);\r
        if (FAILED(hr)) {\r
                return hr;\r
        }\r