Skip to contentSkip to conversation

opensm/osm_qos_policy.c: change a log message

PATCH In review Yevgeny Kliteynik 2 participants 2 messages Sep 5, 2010 – Sep 6, 2010 1 message not in the archive InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 opensm/osm_qos_policy.c: change a log message

Pring multicast group GID rather than LID -
MGID is more relevant than MLID in this context.

---
V2: fixed the log message

 opensm/opensm/osm_qos_policy.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
opensm/opensm/osm_qos_policy.c +5 -2
index 72df6c8..fa04e10 100644
@@ -48,6 +48,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <arpa/inet.h>
 #include <opensm/osm_log.h>
 #include <opensm/osm_node.h>
 #include <opensm/osm_port.h>
@@ -772,6 +773,7 @@ static void __qos_policy_validate_pkey(
 	uint8_t sl;
 	uint32_t flow;
 	uint8_t hop;
+	char gid_str[INET6_ADDRSTRLEN];
 
 	if (!p_qos_policy || !p_qos_match_rule || !p_prtn)
 		return;
@@ -801,9 +803,10 @@ static void __qos_policy_validate_pkey(
 				  &sl, &flow, &hop);
 	if (sl != p_prtn->sl) {
 		OSM_LOG(&p_qos_policy->p_subn->p_osm->log, OSM_LOG_DEBUG,
-			"Updating MCGroup (MLID 0x%04x) SL to "
+			"Updating MCGroup (MGID %s) SL to "
 			"match partition SL (%u)\n",
-			cl_hton16(p_prtn->mgrp->mcmember_rec.mlid),
+			inet_ntop(AF_INET6, p_prtn->mgrp->mcmember_rec.mgid.raw,
+				  gid_str, sizeof gid_str),
 			p_prtn->sl);
 		p_prtn->mgrp->mcmember_rec.sl_flow_hop =
 			ib_member_set_sl_flow_hop(p_prtn->sl, flow, hop);
Signature · 7 lines
1.6.2.4


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 4C83B646.7070903-VPRAkNaXOzVS1MOuV/[email protected]

#2 lore raw
Quoted 4 lines · Yevgeny Kliteynik

Pring multicast group GID rather than LID -
MGID is more relevant than MLID in this context.

Applied with tiny change (see below). Thanks.

Quoted 19 lines

---
V2: fixed the log message

 opensm/opensm/osm_qos_policy.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
opensm/opensm/osm_qos_policy.c +1 -0
index 72df6c8..fa04e10 100644
@@ -48,6 +48,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <arpa/inet.h>
 #include <opensm/osm_log.h>
 #include <opensm/osm_node.h>
 #include <opensm/osm_port.h>

opensm/opensm/osm_qos_policy.c static void __qos_policy_validate_pkey( · line 776

Quoted 4 lines
opensm/opensm/osm_qos_policy.c +1 -0
@@ -772,6 +773,7 @@ static void __qos_policy_validate_pkey(
 	uint8_t sl;
 	uint32_t flow;
 	uint8_t hop;
+	char gid_str[INET6_ADDRSTRLEN];

I moved this string declaration to be under related 'if'...

opensm/opensm/osm_qos_policy.c static void __qos_policy_validate_pkey( · line 804

Quoted 6 lines
opensm/opensm/osm_qos_policy.c +0 -0
 	if (!p_qos_policy || !p_qos_match_rule || !p_prtn)
 		return;
@@ -801,9 +803,10 @@ static void __qos_policy_validate_pkey(
 				  &sl, &flow, &hop);
 	if (sl != p_prtn->sl) {

there...

Sasha

Quoted 14 lines
opensm/opensm/osm_qos_policy.c +3 -2
 		OSM_LOG(&p_qos_policy->p_subn->p_osm->log, OSM_LOG_DEBUG,
-			"Updating MCGroup (MLID 0x%04x) SL to "
+			"Updating MCGroup (MGID %s) SL to "
 			"match partition SL (%u)\n",
-			cl_hton16(p_prtn->mgrp->mcmember_rec.mlid),
+			inet_ntop(AF_INET6, p_prtn->mgrp->mcmember_rec.mgid.raw,
+				  gid_str, sizeof gid_str),
 			p_prtn->sl);
 		p_prtn->mgrp->mcmember_rec.sl_flow_hop =
 			ib_member_set_sl_flow_hop(p_prtn->sl, flow, hop);
Signature · 1 line
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html