File 0003-replaced-removed-defines-which-are-already... of Package ipmitool.9166

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-replaced-removed-defines-which-are-already-present-i.patch of Package ipmitool.9166

From 89cffb984b4dee8edc1740a9837876a2164f8b73 Mon Sep 17 00:00:00 2001
From: Bjoern Spruck <bspruck@uni-mainz.de>
Date: Thu, 1 Sep 2016 11:27:38 +0200
Subject: [PATCH 03/17] replaced/removed defines which are already present in
 ipmi_picmg.h

Signed-off-by: Bjoern Spruck <bspruck@uni-mainz.de>
---
 lib/ipmi_picmg.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c
index c7d9c8e..2166cbe 100644
--- a/lib/ipmi_picmg.c
+++ b/lib/ipmi_picmg.c
@@ -37,11 +37,6 @@
 #include <ipmitool/ipmi_strings.h>
 #include <ipmitool/log.h>
 
-#define PICMG_EXTENSION_ATCA_MAJOR_VERSION  2
-#define PICMG_EXTENSION_AMC0_MAJOR_VERSION  4
-#define PICMG_EXTENSION_UTCA_MAJOR_VERSION  5
-
-
 #define PICMG_EKEY_MODE_QUERY          0
 #define PICMG_EKEY_MODE_PRINT_ALL      1
 #define PICMG_EKEY_MODE_PRINT_ENABLED  2
@@ -2367,9 +2362,9 @@ picmg_discover(struct ipmi_intf *intf) {
 	} else if (rsp->data[0] != 0) {
 	    lprintf(LOG_INFO,"Invalid Get PICMG Properties group extension %#x",
 		    rsp->data[0]);
-	} else if ((rsp->data[1] & 0x0F) != PICMG_EXTENSION_ATCA_MAJOR_VERSION
-		&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_AMC0_MAJOR_VERSION
-		&& (rsp->data[1] & 0x0F) != PICMG_EXTENSION_UTCA_MAJOR_VERSION) {
+	} else if ((rsp->data[1] & 0x0F) != PICMG_ATCA_MAJOR_VERSION
+		&& (rsp->data[1] & 0x0F) != PICMG_AMC_MAJOR_VERSION
+		&& (rsp->data[1] & 0x0F) != PICMG_UTCA_MAJOR_VERSION) {
 	    lprintf(LOG_INFO,"Unknown PICMG Extension Version %d.%d",
 		    (rsp->data[1] & 0x0F), (rsp->data[1] >> 4));
 	} else {
-- 
1.8.5.6

Places

File 0003-replaced-removed-defines-which-are-already-present-i.patch of Package ipmitool.9166

Places