[ofa-general] [PATCH 2/2] libvendor/osm_vendor_mlx_dispatcher.c: Eliminate no longer needed osmv_mad_is_response

[Hal Rosenstock]

Use ib_mad_is_response (which now supports trap repress)

Signed-off-by: Hal Rosenstock <hal.rosenstock at gmail.com>

---
diff --git a/opensm/include/vendor/osm_vendor_mlx_svc.h b/opensm/include/vendor/osm_vendor_mlx_svc.h
index f23a77d..43a83e3 100644
--- a/opensm/include/vendor/osm_vendor_mlx_svc.h
+++ b/opensm/include/vendor/osm_vendor_mlx_svc.h
@@ -50,12 +50,6 @@
 #endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-inline static boolean_t osmv_mad_is_response(IN const ib_mad_t * p_mad)
-{
-	return (ib_mad_is_response(p_mad) ||
-		(p_mad->method == IB_MAD_METHOD_TRAP_REPRESS));
-}
-
 inline static uint8_t osmv_invert_method(IN uint8_t req_method)
 {
 	switch (req_method) {
diff --git a/opensm/libvendor/osm_vendor_ibumad.c b/opensm/libvendor/osm_vendor_ibumad.c
index 2d53ff4..f393676 100644
--- a/opensm/libvendor/osm_vendor_ibumad.c
+++ b/opensm/libvendor/osm_vendor_ibumad.c
@@ -113,7 +113,7 @@ static void clear_madw(osm_vendor_t * p_vend)
 			pthread_mutex_unlock(&p_vend->match_tbl_mutex);
 			OSM_LOG(p_vend->p_log, OSM_LOG_ERROR, "ERR 5401: "
 				"evicting entry %p (tid was 0x%" PRIx64 ")\n",
-				old_m, old_tid);
+				old_m, cl_ntoh64(old_tid));
 			goto Exit;
 		}
 	}
diff --git a/opensm/libvendor/osm_vendor_mlx_dispatcher.c b/opensm/libvendor/osm_vendor_mlx_dispatcher.c
index d476382..1954547 100644
--- a/opensm/libvendor/osm_vendor_mlx_dispatcher.c
+++ b/opensm/libvendor/osm_vendor_mlx_dispatcher.c
@@ -193,7 +193,7 @@ __osmv_dispatch_route(IN osm_bind_handle_t h_bind,
 {
 	ib_api_status_t ret;
 	osmv_bind_obj_t *p_bo = (osmv_bind_obj_t *) h_bind;
-	boolean_t is_resp = osmv_mad_is_response(p_mad);
+	boolean_t is_resp = ib_mad_is_response(p_mad);
 	boolean_t is_txn;
 	uint64_t key = cl_ntoh64(p_mad->trans_id);