Remove unused pfn_ui_pre_lid_assign and pfn_ui_mcast_fdb_assign callbacks
from OpenSM subnet options.
Signed-off-by: Sasha Khapyorsky <[EMAIL PROTECTED]>
---
opensm/include/opensm/osm_subnet.h | 20 ------------------
opensm/opensm/osm_lid_mgr.c | 7 ------
opensm/opensm/osm_mcast_mgr.c | 40 ++++++-----------------------------
opensm/opensm/osm_subnet.c | 4 ---
4 files changed, 7 insertions(+), 64 deletions(-)
diff --git a/opensm/include/opensm/osm_subnet.h
b/opensm/include/opensm/osm_subnet.h
index daab453..56b0165 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -248,10 +248,6 @@ typedef struct _osm_subn_opt {
uint16_t console_port;
cl_map_t port_prof_ignore_guids;
boolean_t port_profile_switch_nodes;
- osm_pfn_ui_extension_t pfn_ui_pre_lid_assign;
- void *ui_pre_lid_assign_ctx;
- osm_pfn_ui_mcast_extension_t pfn_ui_mcast_fdb_assign;
- void *ui_mcast_fdb_assign_ctx;
boolean_t sweep_on_trap;
char *routing_engine_name;
boolean_t connect_roots;
@@ -412,22 +408,6 @@ typedef struct _osm_subn_opt {
* If TRUE will count the number of switch nodes routed through
* the link. If FALSE - only CA/RT nodes are counted.
*
-* pfn_ui_pre_lid_assign
-* A UI function to be invoked prior to lid assigment. It should
-* return 1 if any change was made to any lid or 0 otherwise.
-*
-* ui_pre_lid_assign_ctx
-* A UI context (void *) to be provided to the
pfn_ui_pre_lid_assign
-*
-* pfn_ui_mcast_fdb_assign
-* A UI function to be called inside the mcast manager instead of
-* the call for the build spanning tree. This will be called on
-* every multicast call for create, join and leave, and is
-* responsible for the mcast FDB configuration.
-*
-* ui_mcast_fdb_assign_ctx
-* A UI context (void *) to be provided to the
pfn_ui_mcast_fdb_assign
-*
* sweep_on_trap
* Received traps will initiate a new sweep.
*
diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c
index af0d020..7f25750 100644
--- a/opensm/opensm/osm_lid_mgr.c
+++ b/opensm/opensm/osm_lid_mgr.c
@@ -1212,13 +1212,6 @@ osm_signal_t osm_lid_mgr_process_sm(IN osm_lid_mgr_t *
const p_mgr)
persistent db */
__osm_lid_mgr_init_sweep(p_mgr);
- if (p_mgr->p_subn->opt.pfn_ui_pre_lid_assign) {
- OSM_LOG(p_mgr->p_log, OSM_LOG_VERBOSE,
- "Invoking UI function pfn_ui_pre_lid_assign\n");
- p_mgr->p_subn->opt.pfn_ui_pre_lid_assign(p_mgr->p_subn->opt.
- ui_pre_lid_assign_ctx);
- }
-
/* Set the send_set_reqs of the p_mgr to FALSE, and
we'll see if any set requests were sent. If not -
can signal OSM_SIGNAL_DONE */
diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c
index 683a16d..a6185fe 100644
--- a/opensm/opensm/osm_mcast_mgr.c
+++ b/opensm/opensm/osm_mcast_mgr.c
@@ -1085,7 +1085,6 @@ osm_mcast_mgr_process_tree(osm_sm_t * sm,
{
ib_api_status_t status = IB_SUCCESS;
ib_net16_t mlid;
- boolean_t ui_mcast_fdb_assign_func_defined;
OSM_LOG_ENTER(sm->p_log);
@@ -1107,44 +1106,19 @@ osm_mcast_mgr_process_tree(osm_sm_t * sm,
goto Exit;
}
- if (sm->p_subn->opt.pfn_ui_mcast_fdb_assign)
- ui_mcast_fdb_assign_func_defined = TRUE;
- else
- ui_mcast_fdb_assign_func_defined = FALSE;
-
/*
Clear the multicast tables to start clean, then build
the spanning tree which sets the mcast table bits for each
port in the group.
- We will clean the multicast tables if a ui_mcast function isn't
- defined, or if such function is defined, but we got here
- through a MC_CREATE request - this means we are creating a new
- multicast group - clean all old data.
*/
- if (ui_mcast_fdb_assign_func_defined == FALSE ||
- req_type == OSM_MCAST_REQ_TYPE_CREATE)
- __osm_mcast_mgr_clear(sm, p_mgrp);
-
- /* If a UI function is defined, then we will call it here.
- If not - the use the regular build spanning tree function */
- if (ui_mcast_fdb_assign_func_defined == FALSE) {
- status = __osm_mcast_mgr_build_spanning_tree(sm, p_mgrp);
- if (status != IB_SUCCESS) {
- OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A17: "
- "Unable to create spanning tree (%s)\n",
- ib_get_err_str(status));
- goto Exit;
- }
- } else {
- if (osm_log_is_active(sm->p_log, OSM_LOG_DEBUG)) {
- OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
- "Invoking UI function
pfn_ui_mcast_fdb_assign\n");
- }
+ __osm_mcast_mgr_clear(sm, p_mgrp);
- sm->p_subn->opt.pfn_ui_mcast_fdb_assign(sm->p_subn->opt.
- ui_mcast_fdb_assign_ctx,
- mlid, req_type,
- port_guid);
+ status = __osm_mcast_mgr_build_spanning_tree(sm, p_mgrp);
+ if (status != IB_SUCCESS) {
+ OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0A17: "
+ "Unable to create spanning tree (%s)\n",
+ ib_get_err_str(status));
+ goto Exit;
}
Exit:
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index a916270..2191f2d 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -453,10 +453,6 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * const
p_opt)
p_opt->qos_policy_file = OSM_DEFAULT_QOS_POLICY_FILE;
p_opt->accum_log_file = TRUE;
p_opt->port_profile_switch_nodes = FALSE;
- p_opt->pfn_ui_pre_lid_assign = NULL;
- p_opt->ui_pre_lid_assign_ctx = NULL;
- p_opt->pfn_ui_mcast_fdb_assign = NULL;
- p_opt->ui_mcast_fdb_assign_ctx = NULL;
p_opt->sweep_on_trap = TRUE;
p_opt->routing_engine_name = NULL;
p_opt->connect_roots = FALSE;
--
1.5.4.rc2.60.gb2e62
