diff options
| author | Jim Mankovich <jmank@hp.com> | 2014-08-11 11:21:23 -0600 |
|---|---|---|
| committer | Jim Mankovich <jmank@hp.com> | 2014-08-11 11:21:23 -0600 |
| commit | 9372d2e34e25c02b45c5b780e95b62b1a0589c4a (patch) | |
| tree | 0841f323a7bcd218305dda735fd2d9ca1d801d53 | |
| parent | 9babab10f3981b81c0c693b3d3d9115c20fb2bf6 (diff) | |
| download | ipmitool-9372d2e34e25c02b45c5b780e95b62b1a0589c4a.tar.gz | |
ID: 328 HPM.2 fixes
Fix commited for Dmitry Bazhenov
| -rw-r--r-- | include/ipmitool/hpm2.h | 5 | ||||
| -rw-r--r-- | lib/hpm2.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/ipmitool/hpm2.h b/include/ipmitool/hpm2.h index 1c0a612..9e2a3a6 100644 --- a/include/ipmitool/hpm2.h +++ b/include/ipmitool/hpm2.h @@ -39,6 +39,11 @@ #define HPM2_LAN_PARAMS_REV 0x01 #define HPM2_SOL_PARAMS_REV 0x01 #define HPM3_LAN_PARAMS_REV 0x01 +/* IPMI defines parameter revision as + * MSN = present revision, + * LSN = oldest revision parameter is + * backward compatible with. */ +#define LAN_PARAM_REV(x, y) ((x) << 4 | (y) & 0xF) /* HPM.2 capabilities */ #define HPM2_CAPS_SOL_EXTENSION 0x01 @@ -30,6 +30,7 @@ * EVEN IF PPS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ +#include <ipmitool/bswap.h> #include <ipmitool/hpm2.h> #include <ipmitool/ipmi_intf.h> #include <ipmitool/log.h> @@ -233,7 +234,8 @@ int hpm2_get_lan_channel_capabilities(struct ipmi_intf * intf, } /* check parameter revision */ - if (rsp->data[0] != HPM2_LAN_PARAMS_REV) { + if (rsp->data[0] != + LAN_PARAM_REV(HPM2_LAN_PARAMS_REV, HPM2_LAN_PARAMS_REV)) { lprintf(LOG_NOTICE, "Bad HPM.2 LAN parameter revision, rev=%d", rsp->data[0]); return -1; |