refresh (create temporary patch)

diff --git a/meta b/meta
index 5b5d768d0e71d51d0f27b93bd31c35238b9fb353..cb18195b35cbd2b9d8108d87331d6f0ca6b32aec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 891e922f47d845286f919e0bbc2b4096fd9efefa
-Head: 203200b529da9084bf76484744ff166fe2fdd84b
+Previous: 84b0849d7c20c2ed6a0ffb9062346fdb6869a7e2
+Head: 0d27a4005b38bb367d4e90d88fb0c7d11f157b66
 Applied:
   rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
   port_attr: 6cb488a1a7ddc36e7017499d52152f0267669e02
@@ -12,6 +12,7 @@ Applied:
   dapl-ep: 7c051b9cb43f4cecd1a23b9a2a45b5b76b58966b
   umad-free: 3e74b35f9cf02541669611d5270a05f8151272df
   umad_reg: 203200b529da9084bf76484744ff166fe2fdd84b
+  refresh-temp: 0d27a4005b38bb367d4e90d88fb0c7d11f157b66
 Unapplied:
   debug-wv: f98e9be2365ed35d30abdf31128c331322849c93
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..6ac2d19
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,59 @@
+Bottom: 9aede31f34b9ec3d409f4a86bfccea6ea6abe186
+Top:    579738106348ee09a55e96b35eb8a30ba7cfccb6
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-03-26 12:54:22 -0700
+
+Refresh of umad_reg
+
+---
+
+diff --git a/trunk/ulp/libibumad/src/umad.cpp b/trunk/ulp/libibumad/src/umad.cpp
+index a258107..4590fef 100644
+--- a/trunk/ulp/libibumad/src/umad.cpp
++++ b/trunk/ulp/libibumad/src/umad.cpp
+@@ -633,9 +633,9 @@ int umad_poll(int portid, int timeout_ms)
+       return 0;\r
+ }\r
+ \r
+-__declspec(dllexport)\r
+-int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version,\r
+-                                        uint8_t oui[3], long method_mask[16/sizeof(long)])\r
++static int umad_reg_oui(int portid, int mgmt_class, int mgmt_version,\r
++                                              uint8_t rmpp_version, uint8_t oui[3],\r
++                                              long method_mask[16/sizeof(long)])\r
+ {\r
+       WM_REGISTER reg;\r
+       UINT64          id = 0;\r
+@@ -646,7 +646,7 @@ int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version,
+       reg.Qpn = (mgmt_class == 0x01 || mgmt_class == 0x81) ? 0 : htonl(1);\r
+       reg.Port = ports[portid].port_num;\r
+       reg.Class = (uint8_t) mgmt_class;\r
+-      reg.Version = 1;\r
++      reg.Version = (uint8_t) mgmt_version;\r
+       memset(reg.Reserved, 0, sizeof(reg.Reserved));\r
+       memcpy(reg.Oui, oui, sizeof(oui));\r
+       if (method_mask != NULL) {\r
+@@ -660,13 +660,22 @@ int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version,
+ }\r
+ \r
+ __declspec(dllexport)\r
++int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version,\r
++                                        uint8_t oui[3], long method_mask[16/sizeof(long)])\r
++{\r
++      return umad_reg_oui(portid, mgmt_class, 1,\r
++                                              rmpp_version, oui, method_mask);\r
++}\r
++\r
++__declspec(dllexport)\r
+ int umad_register(int portid, int mgmt_class, int mgmt_version,\r
+                                 uint8_t rmpp_version, long method_mask[16/sizeof(long)])\r
+ {\r
+       uint8_t oui[3];\r
+ \r
+       memset(oui, 0, 3);\r
+-      return umad_register_oui(portid, mgmt_class, rmpp_version, oui, method_mask);\r
++      return umad_reg_oui(portid, mgmt_class, mgmt_version,\r
++                                              rmpp_version, oui, method_mask);\r
+ }\r
+ \r
+ __declspec(dllexport)