Refresh of umad_reg

diff --git a/trunk/ulp/libibumad/src/umad.cpp b/trunk/ulp/libibumad/src/umad.cpp
index a25810774ffc19fa9858f8395b41f206c2b28a34..4590fef1782f1ccfe77850dddf51301ee745a4f0 100644 (file)
--- 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
@@ -659,6 +659,14 @@ int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version,
        return (int) id;\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
+{\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
@@ -666,7 +674,8 @@ int umad_register(int portid, int mgmt_class, int mgmt_version,
        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)\r