nd2/provide: update provider APIs to match latest spec

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/trunk/ulp/netdirect2/user/nd_adapter.h b/trunk/ulp/netdirect2/user/nd_adapter.h
index 982157074de71a0a7de41069cc5826a301575812..4210ee3747eee1bd1477c6b19533d05a2e5f3da2 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_adapter.h
+++ b/trunk/ulp/netdirect2/user/nd_adapter.h
@@ -74,7 +74,7 @@ public:
        ~CNDAdapter();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDProvider *pProvider, UINT64 adapterId, INDAdapter** ppAdapter)\r
+       CreateInstance(CNDProvider *pProvider, UINT64 adapterId, VOID** ppAdapter)\r
        {\r
                HRESULT hr;\r
                CNDAdapter *adapter;\r

diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp
index 92835fdf2516357d1cd0f28e57e20f6affad6611..968193d483796d73c275c17aa0766572fe917423 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_provider.cpp
+++ b/trunk/ulp/netdirect2/user/nd_provider.cpp
@@ -148,8 +148,12 @@ ResolveAddress(const struct sockaddr* pAddress, SIZE_T cbAddress, UINT64* pAdapt
 }\r
 \r
 STDMETHODIMP CNDProvider::\r
-OpenAdapter(UINT64 adapterId, INDAdapter** ppAdapter)\r
+OpenAdapter(REFIID iid, UINT64 adapterId, VOID** ppAdapter)\r
 {\r
+       if (iid != IID_INDAdapter) {\r
+               return E_NOINTERFACE;\r
+       }\r
+\r
        return CNDAdapter::CreateInstance(this, adapterId, ppAdapter);\r
 }\r
 \r

diff --git a/trunk/ulp/netdirect2/user/nd_provider.h b/trunk/ulp/netdirect2/user/nd_provider.h
index 15a74f6ec7ee3e46c54176b97db866e6e066bfd7..b0e370947b7b3d9cfd0acbdb62eff3a890628d50 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_provider.h
+++ b/trunk/ulp/netdirect2/user/nd_provider.h
@@ -49,7 +49,7 @@ public:
                                                                  SIZE_T* pcbAddressList);\r
        STDMETHODIMP ResolveAddress(const struct sockaddr* pAddress,\r
                                                                SIZE_T cbAddress, UINT64* pAdapterId);\r
-       STDMETHODIMP OpenAdapter(UINT64 adapterId, INDAdapter** ppAdapter);\r
+       STDMETHODIMP OpenAdapter(REFIID iid, UINT64 adapterId, VOID** ppAdapter);\r
 \r
        CNDProvider();\r
        ~CNDProvider();\r