[ofa-general] [PATCH] opensm: remove update_master_sm_base_lid field in PortInfo madw context

Sasha Khapyorsky sashak at voltaire.com
Sat Oct 25 08:04:25 PDT 2008


remove unused (always FALSE) update_master_sm_base_lid field from
PortInfo mad wrapper context.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_madw.h  |    1 -
 opensm/opensm/osm_lid_mgr.c       |    1 -
 opensm/opensm/osm_link_mgr.c      |    1 -
 opensm/opensm/osm_node_info_rcv.c |    2 --
 opensm/opensm/osm_pkey_mgr.c      |    1 -
 opensm/opensm/osm_port_info_rcv.c |   15 ---------------
 opensm/opensm/osm_state_mgr.c     |    1 -
 opensm/opensm/osm_sw_info_rcv.c   |    1 -
 opensm/opensm/osm_trap_rcv.c      |    3 ---
 9 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/opensm/include/opensm/osm_madw.h b/opensm/include/opensm/osm_madw.h
index 2843736..f47142d 100644
--- a/opensm/include/opensm/osm_madw.h
+++ b/opensm/include/opensm/osm_madw.h
@@ -172,7 +172,6 @@ typedef struct osm_pi_context {
 	ib_net64_t port_guid;
 	boolean_t set_method;
 	boolean_t light_sweep;
-	boolean_t update_master_sm_base_lid;
 	boolean_t active_transition;
 } osm_pi_context_t;
 /*********/
diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c
index e0a6639..0c536a8 100644
--- a/opensm/opensm/osm_lid_mgr.c
+++ b/opensm/opensm/osm_lid_mgr.c
@@ -1086,7 +1086,6 @@ __osm_lid_mgr_set_physp_pi(IN osm_lid_mgr_t * const p_mgr,
 	context.pi_context.node_guid = osm_node_get_node_guid(p_node);
 	context.pi_context.port_guid = osm_physp_get_port_guid(p_physp);
 	context.pi_context.set_method = TRUE;
-	context.pi_context.update_master_sm_base_lid = FALSE;
 	context.pi_context.light_sweep = FALSE;
 	context.pi_context.active_transition = FALSE;
 
diff --git a/opensm/opensm/osm_link_mgr.c b/opensm/opensm/osm_link_mgr.c
index d60d60e..37e3e1b 100644
--- a/opensm/opensm/osm_link_mgr.c
+++ b/opensm/opensm/osm_link_mgr.c
@@ -302,7 +302,6 @@ __osm_link_mgr_set_physp_pi(osm_sm_t * sm,
 	context.pi_context.node_guid = osm_node_get_node_guid(p_node);
 	context.pi_context.port_guid = osm_physp_get_port_guid(p_physp);
 	context.pi_context.set_method = TRUE;
-	context.pi_context.update_master_sm_base_lid = FALSE;
 	context.pi_context.light_sweep = FALSE;
 
 	/* We need to send the PortInfoSet request with the new sm_lid
diff --git a/opensm/opensm/osm_node_info_rcv.c b/opensm/opensm/osm_node_info_rcv.c
index 984a8dd..20b16d1 100644
--- a/opensm/opensm/osm_node_info_rcv.c
+++ b/opensm/opensm/osm_node_info_rcv.c
@@ -288,7 +288,6 @@ __osm_ni_rcv_process_new_node(IN osm_sm_t * sm,
 	context.pi_context.node_guid = p_ni->node_guid;
 	context.pi_context.port_guid = p_ni->port_guid;
 	context.pi_context.set_method = FALSE;
-	context.pi_context.update_master_sm_base_lid = FALSE;
 	context.pi_context.light_sweep = FALSE;
 	context.pi_context.active_transition = FALSE;
 
@@ -478,7 +477,6 @@ __osm_ni_rcv_process_existing_ca_or_router(IN osm_sm_t * sm,
 	context.pi_context.node_guid = p_ni->node_guid;
 	context.pi_context.port_guid = p_ni->port_guid;
 	context.pi_context.set_method = FALSE;
-	context.pi_context.update_master_sm_base_lid = FALSE;
 	context.pi_context.light_sweep = FALSE;
 
 	status = osm_req_get(sm, osm_physp_get_dr_path_ptr(p_physp),
diff --git a/opensm/opensm/osm_pkey_mgr.c b/opensm/opensm/osm_pkey_mgr.c
index 925c1c7..9df8c85 100644
--- a/opensm/opensm/osm_pkey_mgr.c
+++ b/opensm/opensm/osm_pkey_mgr.c
@@ -226,7 +226,6 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm,
 	    osm_node_get_node_guid(osm_physp_get_node_ptr(p_physp));
 	context.pi_context.port_guid = osm_physp_get_port_guid(p_physp);
 	context.pi_context.set_method = TRUE;
-	context.pi_context.update_master_sm_base_lid = FALSE;
 	context.pi_context.light_sweep = FALSE;
 	context.pi_context.active_transition = FALSE;
 
diff --git a/opensm/opensm/osm_port_info_rcv.c b/opensm/opensm/osm_port_info_rcv.c
index efb8830..47eb457 100644
--- a/opensm/opensm/osm_port_info_rcv.c
+++ b/opensm/opensm/osm_port_info_rcv.c
@@ -638,21 +638,6 @@ void osm_pi_rcv_process(IN void *context, IN void *data)
 					 p_smp->hop_count, p_smp->initial_path);
 		}
 
-		/*
-		   Check if the update_sm_base_lid in the context is TRUE.
-		   If it is - then update the master_sm_base_lid of the variable
-		   in the subnet.
-		 */
-		if (p_context->update_master_sm_base_lid == TRUE) {
-			OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
-				"update_master_sm is TRUE. "
-				"Updating master_sm_base_lid to:%u\n",
-				p_pi->master_sm_base_lid);
-
-			sm->p_subn->master_sm_base_lid =
-			    p_pi->master_sm_base_lid;
-		}
-
 		/* if port just inited or reached INIT state (external reset)
 		   request update for port related tables */
 		p_physp->need_update =
diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c
index ce010cb..174cee6 100644
--- a/opensm/opensm/osm_state_mgr.c
+++ b/opensm/opensm/osm_state_mgr.c
@@ -179,7 +179,6 @@ __osm_state_mgr_get_remote_port_info(IN osm_sm_t * sm,
 	mad_context.pi_context.port_guid = p_physp->port_guid;
 	mad_context.pi_context.set_method = FALSE;
 	mad_context.pi_context.light_sweep = TRUE;
-	mad_context.pi_context.update_master_sm_base_lid = FALSE;
 	mad_context.pi_context.active_transition = FALSE;
 
 	/* note that with some negative logic - if the query failed it means that
diff --git a/opensm/opensm/osm_sw_info_rcv.c b/opensm/opensm/osm_sw_info_rcv.c
index 99315b2..6ee1538 100644
--- a/opensm/opensm/osm_sw_info_rcv.c
+++ b/opensm/opensm/osm_sw_info_rcv.c
@@ -94,7 +94,6 @@ __osm_si_rcv_get_port_info(IN osm_sm_t * sm,
 	context.pi_context.node_guid = osm_node_get_node_guid(p_node);
 	context.pi_context.port_guid = osm_physp_get_port_guid(p_physp);
 	context.pi_context.set_method = FALSE;
-	context.pi_context.update_master_sm_base_lid = FALSE;
 	context.pi_context.light_sweep = FALSE;
 	context.pi_context.active_transition = FALSE;
 
diff --git a/opensm/opensm/osm_trap_rcv.c b/opensm/opensm/osm_trap_rcv.c
index e9a9c22..cf5e8a5 100644
--- a/opensm/opensm/osm_trap_rcv.c
+++ b/opensm/opensm/osm_trap_rcv.c
@@ -500,9 +500,6 @@ __osm_trap_rcv_process_request(IN osm_sm_t * sm,
 						    (p_physp);
 						context.pi_context.set_method =
 						    TRUE;
-						context.pi_context.
-						    update_master_sm_base_lid =
-						    FALSE;
 						context.pi_context.light_sweep =
 						    FALSE;
 						context.pi_context.
-- 
1.6.0.3.517.g759a




More information about the general mailing list