From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 5 Mar 2010 18:40:39 +0000 (-0800)
Subject: Refresh of nd-conn
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4aec96faf8afa7009d0d34d5705acabe9097dc5c;p=~shefty%2Frdma-win.git

Refresh of nd-conn
---

diff --git a/trunk/ulp/netdirect/user/nd_connect.cpp b/trunk/ulp/netdirect/user/nd_connect.cpp
index 81d5f7bd..ce25499a 100644
--- a/trunk/ulp/netdirect/user/nd_connect.cpp
+++ b/trunk/ulp/netdirect/user/nd_connect.cpp
@@ -39,15 +39,6 @@ CNDConnector::CNDConnector(CNDAdapter *pAdapter)
 	m_pWvConnEp = NULL;
 }
 
-STDMETHODIMP CNDConnector::
-Init(void)
-{
-	HRESULT hr;
-
-	hr = m_pAdapter->m_pWvProvider->CreateConnectEndpoint(&m_pWvConnEp);
-	return NDConvertWVStatus(hr);
-}
-
 CNDConnector::~CNDConnector()
 {
 	if (m_pWvConnEp != NULL) {
@@ -132,6 +123,15 @@ Connect(INDEndpoint* pEndpoint,
 	IBAT_PATH_BLOB path;
 	HRESULT hr;
 
+	if (m_pWvConnEp != NULL) {
+		m_pWvConnEp->Release();
+	}
+
+	hr = m_pAdapter->m_pWvProvider->CreateConnectEndpoint(&m_pWvConnEp);
+	if (FAILED(hr)) {
+		goto out;
+	}
+
 	RtlCopyMemory(&addr, &m_pAdapter->m_Address, AddressLength);
 	if (addr.Sa.sa_family == AF_INET) {
 		addr.Sin.sin_port = LocalPort;
diff --git a/trunk/ulp/netdirect/user/nd_connect.h b/trunk/ulp/netdirect/user/nd_connect.h
index 2da2f222..5aed1f44 100644
--- a/trunk/ulp/netdirect/user/nd_connect.h
+++ b/trunk/ulp/netdirect/user/nd_connect.h
@@ -94,11 +94,6 @@ public:
 			goto err1;
 		}
 
-		hr = conn->Init();
-		if (FAILED(hr)) {
-			goto err2;
-		}
-
 		*ppConnector = conn;
 		return ND_SUCCESS;