If a routing engine needs to compute spanning trees with special properties, it needs a way to override the default implementation. A routing engine callback provides that mechanism. Routing engines that can use the default implementation can leave the callback pointer set to NULL.
Signed-off-by: Jim Schutt <jasc...@sandia.gov> --- opensm/include/opensm/osm_opensm.h | 6 ++++++ opensm/opensm/osm_mcast_mgr.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/opensm/include/opensm/osm_opensm.h b/opensm/include/opensm/osm_opensm.h index 90c6c0f..59df9ea 100644 --- a/opensm/include/opensm/osm_opensm.h +++ b/opensm/include/opensm/osm_opensm.h @@ -133,6 +133,8 @@ struct osm_routing_engine { uint8_t (*path_sl)(void *context, IN uint8_t path_sl_hint, IN const osm_port_t *src_port, IN const osm_port_t *dst_port); + ib_api_status_t (*mcast_build_stree)(void *context, + IN OUT osm_mgrp_box_t *mgb); void (*delete) (void *context); struct osm_routing_engine *next; }; @@ -167,6 +169,10 @@ struct osm_routing_engine { * path_sl * The callback for computing path SL. * +* mcast_build_stree +* The callback for building the spanning tree for multicast +* forwarding, called per MLID. +* * delete * The delete method, may be used for routing engine * internals cleanup. diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c index 697fb58..e65e459 100644 --- a/opensm/opensm/osm_mcast_mgr.c +++ b/opensm/opensm/osm_mcast_mgr.c @@ -946,6 +946,7 @@ Exit: static ib_api_status_t mcast_mgr_process_mlid(osm_sm_t * sm, uint16_t mlid) { ib_api_status_t status = IB_SUCCESS; + struct osm_routing_engine *re = sm->p_subn->p_osm->routing_engine_used; osm_mgrp_box_t *mbox; OSM_LOG_ENTER(sm->p_log); @@ -960,7 +961,11 @@ static ib_api_status_t mcast_mgr_process_mlid(osm_sm_t * sm, uint16_t mlid) mbox = osm_get_mbox_by_mlid(sm->p_subn, cl_hton16(mlid)); if (mbox) { - status = mcast_mgr_build_spanning_tree(sm, mbox); + if (re && re->mcast_build_stree) + status = re->mcast_build_stree(re->context, mbox); + else + status = mcast_mgr_build_spanning_tree(sm, mbox); + if (status != IB_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A17: " "Unable to create spanning tree (%s) for mlid " -- 1.5.6.GIT -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html