From 1747c08fabd540e6d38b1fd0a68de99b11ee1f63 Mon Sep 17 00:00:00 2001 From: shefty Date: Fri, 18 Jul 2008 09:45:41 +0000 Subject: [PATCH] winverbs: use resv1 field of grh instead of resv2 Use resv1 field to allow for more GIDs assigned to a single node. Signed-off-by: Sean Hefty git-svn-id: svn://openib.tc.cornell.edu/gen1@1417 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/winverbs/core/winverbs/user/wv_device.cpp | 4 ++-- branches/winverbs/core/winverbs/user/wv_device.h | 2 +- branches/winverbs/core/winverbs/user/wv_pd.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/branches/winverbs/core/winverbs/user/wv_device.cpp b/branches/winverbs/core/winverbs/user/wv_device.cpp index 86c4661f..ec955743 100644 --- a/branches/winverbs/core/winverbs/user/wv_device.cpp +++ b/branches/winverbs/core/winverbs/user/wv_device.cpp @@ -294,7 +294,7 @@ out: } STDMETHODIMP CWVDevice:: -FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT8 *pIndex) +FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT16 *pIndex) { WV_GID gid; DWORD index; @@ -307,7 +307,7 @@ FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT8 *pIndex) } if (RtlCompareMemory(pGid, &gid, sizeof(gid)) == sizeof(gid)) { - *pIndex = (UINT8) index; + *pIndex = (UINT16) index; break; } } diff --git a/branches/winverbs/core/winverbs/user/wv_device.h b/branches/winverbs/core/winverbs/user/wv_device.h index 72314c35..613bab93 100644 --- a/branches/winverbs/core/winverbs/user/wv_device.h +++ b/branches/winverbs/core/winverbs/user/wv_device.h @@ -94,7 +94,7 @@ public: *ppDevice = NULL; return hr; } - STDMETHODIMP FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT8 *pIndex); + STDMETHODIMP FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT16 *pIndex); CWVProvider *m_pProvider; uvp_interface_t m_Verbs; diff --git a/branches/winverbs/core/winverbs/user/wv_pd.cpp b/branches/winverbs/core/winverbs/user/wv_pd.cpp index 258205d7..beb1d1dc 100644 --- a/branches/winverbs/core/winverbs/user/wv_pd.cpp +++ b/branches/winverbs/core/winverbs/user/wv_pd.cpp @@ -429,7 +429,7 @@ ConvertAv(ib_av_attr_t *pVerbsAv, WV_ADDRESS_VECTOR *pAv) pVerbsAv->grh_valid = pAv->Route.Valid; if (pVerbsAv->grh_valid) { hr = m_pPd->m_pDevice->FindGidIndex(pAv->PortNumber, &pAv->Route.SGid, - &pVerbsAv->grh.resv2); + &pVerbsAv->grh.resv1); if (FAILED(hr)) { return hr; } -- 2.46.0