refresh (create temporary patch)

diff --git a/meta b/meta
index ff4b8060291d17d644988b1f7e9648032b0d3a64..3ee21d260354048b411c93360c7889e6894765bc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 234cbd389ae95c0977e32c8d5a7cd3a308056c81
-Head: e3895defa9730471054a1fded8295803ce5e9a16
+Previous: 6a3855de43c5f5f0174f1408e2bc08b905e1b8cf
+Head: aeb0a8a1b778ff81279a14578795e94d6e5075ae
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
   nd-prov: 81ab80a03d5f8659869a1bec2a2ab68a3ebf8626
   nd-prov2: e3895defa9730471054a1fded8295803ce5e9a16
+  refresh-temp: aeb0a8a1b778ff81279a14578795e94d6e5075ae
 Unapplied:
   srq: 0024a4123a3ed01d41c946126590641f9f76bc20
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..4c0fb3b
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,40 @@
+Bottom: 74dffe20d8d441f8b0882c6abb75c5d7588c4d83
+Top:    342b16be246e7f36a633b5cdf14866c53ced9987
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-07-26 15:46:20 -0700
+
+Refresh of nd-prov2
+
+---
+
+diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp
+index fc7988b..6f94b71 100644
+--- a/trunk/ulp/netdirect2/user/nd_provider.cpp
++++ b/trunk/ulp/netdirect2/user/nd_provider.cpp
+@@ -163,8 +163,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 b636cfc..0c38d8e 100644
+--- 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();