From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 17 Feb 2010 22:55:58 +0000 (-0800)
Subject: refresh (create temporary patch)
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2659973e72bd7a4bb7bc82b6c348a9055785c864;p=~shefty%2Frdma-win.git

refresh (create temporary patch)
---

diff --git a/meta b/meta
index ff7fe14d..761092ab 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4f9346694b8947f05afdadd04a99cada70d6ac87
-Head: c421800b14f865d18d0c881770282d76802b883b
+Previous: fc7fcc0fac49bf4a91b5a3ed451b60d1405124cb
+Head: 7fab65f7c63488b60f650826ec977a3d321aaea0
 Applied:
   rm-build: 6ece22f911fcfc6fceeb779a3cb16702ab4ba386
   dapl-cleanup2: 81e62e90410bb28ef7b1d23f0f6d7e50aede57a2
@@ -9,6 +9,7 @@ Applied:
   dapl-clean-lock: 33cc4404015c647a832803d6f029938d31c0ba67
   dapl-queue: eae59391d42fc62a1790bad6abf914274720f81c
   retry-ibat: c421800b14f865d18d0c881770282d76802b883b
+  refresh-temp: 7fab65f7c63488b60f650826ec977a3d321aaea0
 Unapplied:
   dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195
   dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..99e520df
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,108 @@
+Bottom: 5be2fd81c9cb0011b245f6751d8bf811d0886a5f
+Top:    c8717016363ea4510580f4eaf9918392bc8975a7
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-02-17 14:55:53 -0800
+
+Refresh of retry-ibat
+
+---
+
+diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp
+index ede0a5e..f3c4289 100644
+--- a/trunk/core/ibat/user/ibat.cpp
++++ b/trunk/core/ibat/user/ibat.cpp
+@@ -366,18 +366,20 @@ ResolvePath(
+     __in const struct sockaddr* pSrcAddr,
+     __in const struct sockaddr* pDestAddr,
+     __out IBAT_PATH_BLOB* pPath,
+-	__in int Timeout)
++	__in DWORD Timeout)
+ {
++	INT64 to;
+ 	HRESULT hr;
+ 
++	to = (Timeout == INFINITE) ? 1 << 63 : (INT64) ((UINT64) Timeout);
+ 	do {
+ 		hr = Resolve(pSrcAddr, pDestAddr, pPath);
+-		if( hr != E_PENDING || Timeout <= 0 )
++		if( hr != E_PENDING || to <= 0 )
+ 			break;
+ 
+-		Timeout -= 10;
++		to -= 10;
+ 		Sleep(10);
+-	} while( Timeout > 0 );
++	} while( to > 0 );
+ 
+ 	return hr;
+ }
+@@ -402,7 +404,7 @@ IbatResolvePath(
+     __in const struct sockaddr* pSrcAddr,
+     __in const struct sockaddr* pDestAddr,
+     __out IBAT_PATH_BLOB* pPath,
+-	__in const int Timeout)
++	__in DWORD Timeout)
+ {
+ 	return IBAT::ResolvePath(pSrcAddr, pDestAddr, pPath, Timeout);
+ }
+diff --git a/trunk/inc/user/iba/ibat.h b/trunk/inc/user/iba/ibat.h
+index e7f2c06..6e84486 100644
+--- a/trunk/inc/user/iba/ibat.h
++++ b/trunk/inc/user/iba/ibat.h
+@@ -41,8 +41,6 @@ typedef struct _IBAT_PATH_BLOB
+ 
+ } IBAT_PATH_BLOB;
+ 
+-#define IBAT_MAX_TIMEOUT 0x0FFFFFFF
+-
+ #ifdef __cplusplus
+ namespace IBAT
+ {
+@@ -59,7 +57,7 @@ ResolvePath(
+     __in const struct sockaddr* pSrcAddr,
+     __in const struct sockaddr* pDestAddr,
+     __out IBAT_PATH_BLOB* pPath,
+-	__in int Timeout	/* ms */
++	__in DWORD Timeout	/* ms */
+     );
+ 
+ }
+@@ -77,9 +75,9 @@ IbatResolvePath(
+     __in const struct sockaddr* pSrcAddr,
+     __in const struct sockaddr* pDestAddr,
+     __out IBAT_PATH_BLOB* pPath,
+-	__in int Timeout	/* ms */
++	__in DWORD Timeout	/* ms */
+     );
+ 
+ #endif /* __cplusplus */
+ 
+-#endif	// _IBAT_H_
+\ No newline at end of file
++#endif	// _IBAT_H_
+diff --git a/trunk/ulp/netdirect/user/nd_connect.cpp b/trunk/ulp/netdirect/user/nd_connect.cpp
+index 6ee6fa0..81d5f7b 100644
+--- a/trunk/ulp/netdirect/user/nd_connect.cpp
++++ b/trunk/ulp/netdirect/user/nd_connect.cpp
+@@ -139,7 +139,7 @@ Connect(INDEndpoint* pEndpoint,
+ 		addr.Sin6.sin6_port = LocalPort;
+ 	}
+ 
+-	hr = IBAT::ResolvePath(&addr.Sa, pAddress, &path, IBAT_MAX_TIMEOUT);
++	hr = IBAT::ResolvePath(&addr.Sa, pAddress, &path, INFINITE);
+ 	if (FAILED(hr)) {
+ 		goto out;
+ 	}
+diff --git a/trunk/ulp/wsd/user/ibsp_ip.c b/trunk/ulp/wsd/user/ibsp_ip.c
+index 0da0c0e..b0124bb 100644
+--- a/trunk/ulp/wsd/user/ibsp_ip.c
++++ b/trunk/ulp/wsd/user/ibsp_ip.c
+@@ -271,7 +271,7 @@ query_guid_address(
+ 
+ 	IBSP_ENTER( IBSP_DBG_HW );
+ 	hr = IbatResolvePath(p_src_addr, p_dest_addr, (IBAT_PATH_BLOB*)&path,
+-		IBAT_MAX_TIMEOUT);
++		INFINITE);
+ 
+ 	if( hr == S_OK )
+ 	{