[TOOLS] fix VSTAT uplink info print

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1056 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/hw/mthca/kernel/hca_verbs.c b/hw/mthca/kernel/hca_verbs.c
index f0ddfbf..788fa54 100644 (file)
--- a/hw/mthca/kernel/hca_verbs.c
+++ b/hw/mthca/kernel/hca_verbs.c
@@ -43,7 +43,6 @@
 #include "mx_abi.h"\r
 #include "mt_pa_cash.h"\r
 \r
-#define PTR_ALIGN(size)        (((size) + sizeof(void*) - 1) & ~(sizeof(void*) - 1))\r
 \r
 \r
 // Local declarations\r
@@ -1695,3 +1694,4 @@ setup_ci_interface(
        return;\r
 }\r
 \r
+\r

diff --git a/inc/mthca/mthca_vc.h b/inc/mthca/mthca_vc.h
index 3fdf7ff..0636d72 100644 (file)
--- a/inc/mthca/mthca_vc.h
+++ b/inc/mthca/mthca_vc.h
@@ -33,6 +33,8 @@
 #ifndef MTHCA_VC_H
 #define MTHCA_VC_H
 
+#define PTR_ALIGN(size)        (((size) + sizeof(void*) - 1) & ~(sizeof(void*) - 1))
+
 typedef
 struct _map_crspace {
        unsigned __int64        va;             /* address of CRSPACE, mapped to user space */
@@ -78,12 +80,12 @@ typedef struct {
 
 inline char* mthca_get_board_id(ib_ca_attr_t *ca_attr)
 {
-    return (char*)(ca_attr)+(ca_attr->size - MTHCA_BRD_ID_LEN - sizeof(uplink_info_t));
+       return (char*)(ca_attr) + (ca_attr->size - PTR_ALIGN(MTHCA_BRD_ID_LEN) - PTR_ALIGN(sizeof(uplink_info_t)));
 }
 
 inline void* mthca_get_uplink_info(ib_ca_attr_t *ca_attr)
 {
-    return (char*)(ca_attr)+(ca_attr->size - sizeof(uplink_info_t));
+       return (char*)(ca_attr) + (ca_attr->size - PTR_ALIGN(sizeof(uplink_info_t)));
 }
 
 #endif