From 1ffedac85b8020d77a4ed0f5926dccf77862a0fb Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 17 Feb 2010 11:42:43 -0800 Subject: [PATCH] Refresh of retry-ibat --- trunk/core/ibat/user/ibat.cpp | 6 ++++-- trunk/ulp/librdmacm/src/cma.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp index 2dfcff1a..ede0a5ee 100644 --- a/trunk/core/ibat/user/ibat.cpp +++ b/trunk/core/ibat/user/ibat.cpp @@ -358,6 +358,9 @@ Resolve( return S_OK; } +#endif // WINVER >= 0x600 + + HRESULT ResolvePath( __in const struct sockaddr* pSrcAddr, @@ -379,8 +382,7 @@ ResolvePath( return hr; } -#endif -} +} /* IBAT namespace */ extern "C" { diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp index 9205c56f..40e74113 100644 --- 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; hr = IBAT::ResolvePath(&id->route.addr.src_addr, &id->route.addr.dst_addr, - path, timeout_ms); + &path, timeout_ms); if (FAILED(hr)) { return hr; } -- 2.46.0