From 0d27a4005b38bb367d4e90d88fb0c7d11f157b66 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 26 Mar 2010 12:54:22 -0700 Subject: [PATCH] Refresh of umad_reg --- trunk/ulp/libibumad/src/umad.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/trunk/ulp/libibumad/src/umad.cpp b/trunk/ulp/libibumad/src/umad.cpp index a2581077..4590fef1 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; } -__declspec(dllexport) -int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version, - uint8_t oui[3], long method_mask[16/sizeof(long)]) +static int umad_reg_oui(int portid, int mgmt_class, int mgmt_version, + uint8_t rmpp_version, uint8_t oui[3], + long method_mask[16/sizeof(long)]) { WM_REGISTER reg; UINT64 id = 0; @@ -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); reg.Port = ports[portid].port_num; reg.Class = (uint8_t) mgmt_class; - reg.Version = 1; + reg.Version = (uint8_t) mgmt_version; memset(reg.Reserved, 0, sizeof(reg.Reserved)); memcpy(reg.Oui, oui, sizeof(oui)); if (method_mask != NULL) { @@ -659,6 +659,14 @@ int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version, return (int) id; } +__declspec(dllexport) +int umad_register_oui(int portid, int mgmt_class, uint8_t rmpp_version, + uint8_t oui[3], long method_mask[16/sizeof(long)]) +{ + return umad_reg_oui(portid, mgmt_class, 1, + rmpp_version, oui, method_mask); +} + __declspec(dllexport) int umad_register(int portid, int mgmt_class, int mgmt_version, uint8_t rmpp_version, long method_mask[16/sizeof(long)]) @@ -666,7 +674,8 @@ int umad_register(int portid, int mgmt_class, int mgmt_version, uint8_t oui[3]; memset(oui, 0, 3); - return umad_register_oui(portid, mgmt_class, rmpp_version, oui, method_mask); + return umad_reg_oui(portid, mgmt_class, mgmt_version, + rmpp_version, oui, method_mask); } __declspec(dllexport) -- 2.46.0