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 <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1417 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/winverbs/core/winverbs/user/wv_device.cpp b/branches/winverbs/core/winverbs/user/wv_device.cpp
index 86c4661f7dfecea1ddaf3eb943352426c0257416..ec95574368fdb94e5fb0c192f4e9683981d29843 100644 (file)
--- a/branches/winverbs/core/winverbs/user/wv_device.cpp
+++ b/branches/winverbs/core/winverbs/user/wv_device.cpp
@@ -294,7 +294,7 @@ out:
 }\r
 \r
 STDMETHODIMP CWVDevice::\r
-FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT8 *pIndex)\r
+FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT16 *pIndex)\r
 {\r
        WV_GID  gid;\r
        DWORD   index;\r
@@ -307,7 +307,7 @@ FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT8 *pIndex)
                }\r
 \r
                if (RtlCompareMemory(pGid, &gid, sizeof(gid)) == sizeof(gid)) {\r
-                       *pIndex = (UINT8) index;\r
+                       *pIndex = (UINT16) index;\r
                        break;\r
                }\r
        }\r

diff --git a/branches/winverbs/core/winverbs/user/wv_device.h b/branches/winverbs/core/winverbs/user/wv_device.h
index 72314c3513eb0f454c485f02004c533279b25749..613bab93bb31ee3c95134ad48823a1d14f437bb6 100644 (file)
--- 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;\r
                return hr;\r
        }\r
-       STDMETHODIMP FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT8 *pIndex);\r
+       STDMETHODIMP FindGidIndex(UINT8 PortNumber, WV_GID *pGid, UINT16 *pIndex);\r
 \r
        CWVProvider             *m_pProvider;\r
        uvp_interface_t m_Verbs;\r

diff --git a/branches/winverbs/core/winverbs/user/wv_pd.cpp b/branches/winverbs/core/winverbs/user/wv_pd.cpp
index 258205d7357e2d91ecd563b79cf9e8deee50453d..beb1d1dccdde3e5ec686e6fa1950b457e8e2ebc8 100644 (file)
--- 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;\r
        if (pVerbsAv->grh_valid) {\r
                hr = m_pPd->m_pDevice->FindGidIndex(pAv->PortNumber, &pAv->Route.SGid,\r
-                                                                                       &pVerbsAv->grh.resv2);\r
+                                                                                       &pVerbsAv->grh.resv1);\r
                if (FAILED(hr)) {\r
                        return hr;\r
                }\r