Signed-off-by: Line Holen line.ho...@oracle.com
---
diff --git a/opensm/osm_lin_fwd_rcv.c b/opensm/osm_lin_fwd_rcv.c
index dd18c09..13d9b72 100644
--- a/opensm/osm_lin_fwd_rcv.c
+++ b/opensm/osm_lin_fwd_rcv.c
@@ -3,6 +3,7 @@
* Copyright (c) 2002-2005,2008 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -104,8 +105,8 @@ void osm_lft_rcv_process(IN void *context, IN void *data)
}
} else {
OSM_LOG(sm-p_log, OSM_LOG_ERROR, ERR 0402:
- Setting forwarding table block failed (%s)
- , Switch 0x% PRIx64 %s\n,
+ Setting forwarding table block %d failed (%s)
+ , Switch 0x% PRIx64 %s\n, block_num,
ib_get_err_str(status), cl_ntoh64(node_guid),
p_sw-p_node-print_desc);
}
diff --git a/opensm/osm_node_desc_rcv.c b/opensm/osm_node_desc_rcv.c
index 065909b..546ffed 100644
--- a/opensm/osm_node_desc_rcv.c
+++ b/opensm/osm_node_desc_rcv.c
@@ -2,6 +2,7 @@
* Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2007 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -87,7 +88,7 @@ static void nd_rcv_process_nd(IN osm_sm_t * sm, IN osm_node_t
* p_node,
#endif /* ENABLE_OSM_PERF_MGR */
OSM_LOG(sm-p_log, OSM_LOG_VERBOSE,
- Node 0x% PRIx64 \n\t\t\t\tDescription = %s\n,
+ Node 0x% PRIx64 , Description = %s\n,
cl_ntoh64(osm_node_get_node_guid(p_node)), p_node-print_desc);
OSM_LOG_EXIT(sm-p_log);
diff --git a/opensm/osm_port_info_rcv.c b/opensm/osm_port_info_rcv.c
index 2ea35b8..7dcd15e 100644
--- a/opensm/osm_port_info_rcv.c
+++ b/opensm/osm_port_info_rcv.c
@@ -3,6 +3,7 @@
* Copyright (c) 2002-2012 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
* Copyright (c) 2009 HNR Consulting. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -146,8 +147,8 @@ static void pi_rcv_process_endport(IN osm_sm_t * sm, IN
osm_physp_t * p_physp,
cl_ntoh64(port_guid));
else {
OSM_LOG(sm-p_log, OSM_LOG_VERBOSE,
- Detected another SM. Requesting SMInfo
- \n\t\t\t\tPort 0x% PRIx64 \n,
+ Detected another SM. Requesting SMInfo
+ from port 0x% PRIx64 \n,
cl_ntoh64(port_guid));
/*
@@ -168,8 +169,10 @@ static void pi_rcv_process_endport(IN osm_sm_t * sm, IN
osm_physp_t * p_physp,
if (status != IB_SUCCESS)
OSM_LOG(sm-p_log, OSM_LOG_ERROR,
ERR 0F05:
- Failure requesting SMInfo
(%s)\n,
- ib_get_err_str(status));
+ Failure requesting SMInfo (%s)
+ from port 0x% PRIx64 \n,
+ ib_get_err_str(status),
+ cl_ntoh64(port_guid));
}
} else {
p_sm =
diff --git a/opensm/osm_sminfo_rcv.c b/opensm/osm_sminfo_rcv.c
index a0092a5..6520e65 100644
--- a/opensm/osm_sminfo_rcv.c
+++ b/opensm/osm_sminfo_rcv.c
@@ -2,6 +2,7 @@
* Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU