commit 14c9741e39401b21e65a249caab08c6546c7572c
author Asaf Mazor <amazor@nvidia.com> Thu Sep 04 11:34:24 2025 +0300
committer Nicolas Morey <nmorey@suse.com> Tue Sep 16 11:29:25 2025 +0200
tree ddaef2a3782a5725cd4f85baa46b294fab6f7a03
parent fa36f7e31f51bee1552dbc0efefa14cd98667737

ibqueryerrors: Fix SMP call to use correct port

[ Upstream commit 26480ca93ec108fbdefb23604dec6df0aa831f84 ]

- Change to correct port on smp_query_via call

Fixes: aaf9f699c10f ("ibqueryerrors: Use API supporting SMI/GSI seperation")
Signed-off-by: Asaf Mazor <amazor@nvidia.com>
Signed-off-by: Nicolas Morey <nmorey@suse.com>

infiniband-diags/ibqueryerrors.c

diff --git a/infiniband-diags/ibqueryerrors.c b/infiniband-diags/ibqueryerrors.c
index 16d9e88..5c30b93 100644
--- a/infiniband-diags/ibqueryerrors.c
+++ b/infiniband-diags/ibqueryerrors.c
@@ -1124,10 +1124,12 @@
 			ibd_ca, ibd_ca_port);
 	}
 
-	smp_mkey_set(ibmad_port, ibd_mkey);
+	smp_mkey_set(ibmad_ports->smi.port, ibd_mkey);
 
-	if (ibd_timeout)
-		mad_rpc_set_timeout(ibmad_port, ibd_timeout);
+	if (ibd_timeout) {
+		mad_rpc_set_timeout(ibmad_ports->smi.port, ibd_timeout);
+		mad_rpc_set_timeout(ibmad_ports->gsi.port, ibd_timeout);
+	}
 
 	if (port_guid_str) {
 		ibnd_port_t *ndport = ibnd_find_port_guid(fabric, port_guid);
@@ -1141,7 +1143,7 @@
 
 		uint8_t ni[IB_SMP_DATA_SIZE] = { 0 };
 		if (!smp_query_via(ni, &portid, IB_ATTR_NODE_INFO, 0,
-			   ibd_timeout, ibmad_port)) {
+			   ibd_timeout, ibmad_ports->smi.port)) {
 				fprintf(stderr, "Failed to query local Node Info\n");
 				goto close_port;
 		}