winverbs: use consistent pkey index sizeof

Use a pkey index size of UINT16 everywhere.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1984 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/core/winverbs/user/wv_device.cpp b/core/winverbs/user/wv_device.cpp
index c326820..4034ef5 100644 (file)
--- a/core/winverbs/user/wv_device.cpp
+++ b/core/winverbs/user/wv_device.cpp
@@ -315,7 +315,7 @@ FindGid(UINT8 PortNumber, WV_GID *pGid, DWORD *pIndex)
 }\r
 \r
 STDMETHODIMP CWVDevice::\r
-QueryPkey(UINT8 PortNumber, DWORD Index, NET16* pPkey)\r
+QueryPkey(UINT8 PortNumber, UINT16 Index, NET16* pPkey)\r
 {\r
        WV_IO_DEVICE_PORT_QUERY query;\r
        NET16                                   *pkeytable;\r
@@ -353,10 +353,10 @@ out:
 }\r
 \r
 STDMETHODIMP CWVDevice::\r
-FindPkey(UINT8 PortNumber, NET16 Pkey, DWORD *pIndex)\r
+FindPkey(UINT8 PortNumber, NET16 Pkey, UINT16 *pIndex)\r
 {\r
        NET16   key;\r
-       DWORD   index;\r
+       UINT16  index;\r
        HRESULT hr;\r
 \r
        for (index = 0; true; index++) {\r

diff --git a/core/winverbs/user/wv_device.h b/core/winverbs/user/wv_device.h
index aa2350b..7e98da1 100644 (file)
--- a/core/winverbs/user/wv_device.h
+++ b/core/winverbs/user/wv_device.h
@@ -56,8 +56,8 @@ public:
        STDMETHODIMP QueryPort(UINT8 PortNumber, WV_PORT_ATTRIBUTES* pAttributes);\r
        STDMETHODIMP QueryGid(UINT8 PortNumber, DWORD Index, WV_GID* pGid);\r
        STDMETHODIMP FindGid(UINT8 PortNumber, WV_GID *pGid, DWORD *pIndex);\r
-       STDMETHODIMP QueryPkey(UINT8 PortNumber, DWORD Index, NET16* pPkey);\r
-       STDMETHODIMP FindPkey(UINT8 PortNumber, NET16 Pkey, DWORD *pIndex);\r
+       STDMETHODIMP QueryPkey(UINT8 PortNumber, UINT16 Index, NET16* pPkey);\r
+       STDMETHODIMP FindPkey(UINT8 PortNumber, NET16 Pkey, UINT16 *pIndex);\r
        STDMETHODIMP CreateCompletionQueue(SIZE_T *pEntries, IWVCompletionQueue** ppCq);\r
        STDMETHODIMP AllocateProtectionDomain(IWVProtectionDomain** ppPd);\r
        STDMETHODIMP Notify(UINT8 PortNumber, OVERLAPPED* pOverlapped, DWORD* pFlags);\r

diff --git a/inc/user/rdma/winverbs.h b/inc/user/rdma/winverbs.h
index 27cb920..d272224 100644 (file)
--- a/inc/user/rdma/winverbs.h
+++ b/inc/user/rdma/winverbs.h
@@ -1414,7 +1414,7 @@ DECLARE_INTERFACE_(IWVDevice, IWVOverlapped)
        STDMETHOD(QueryPkey)(\r
                THIS_\r
                __in UINT8 PortNumber,\r
-               __in DWORD Index,\r
+               __in UINT16 Index,\r
                __out NET16* pPkey\r
                ) PURE;\r
 \r
@@ -1422,7 +1422,7 @@ DECLARE_INTERFACE_(IWVDevice, IWVOverlapped)
                THIS_\r
                __in UINT8 PortNumber,\r
                __in NET16 Pkey,\r
-               __out DWORD* pIndex\r
+               __out UINT16* pIndex\r
                ) PURE;\r
 \r
        STDMETHOD(CreateCompletionQueue)(\r