[ofa-general] [PATCH] OpenSM: Set packet life time to subnet timeout option rather than default

[Hal Rosenstock]

OpenSM: Set packet life time to subnet timeout option rather than
default

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

diff --git a/opensm/opensm/osm_prtn.c b/opensm/opensm/osm_prtn.c
index 76227c0..2d0b313 100644
--- a/opensm/opensm/osm_prtn.c
+++ b/opensm/opensm/osm_prtn.c
@@ -215,7 +215,7 @@ ib_api_status_t osm_prtn_add_mcgroup(osm_log_t * p_log,
 	mc_rec.tclass = 0;
 	mc_rec.pkey = pkey;
 	mc_rec.rate = (rate ? rate : OSM_DEFAULT_MGRP_RATE) | (2 << 6);	/* 10Gb/sec */
-	mc_rec.pkt_life = OSM_DEFAULT_SUBNET_TIMEOUT;
+	mc_rec.pkt_life = p_subn->opt.subnet_timeout;
 	mc_rec.sl_flow_hop = ib_member_set_sl_flow_hop(p->sl, 0, hop_limit);
 	/* Scope in MCMemberRecord (if present) needs to be consistent with MGID */
 	mc_rec.scope_state = ib_member_set_scope_state(scope, IB_MC_REC_STATE_FULL_MEMBER);
diff --git a/opensm/opensm/osm_sa_multipath_record.c b/opensm/opensm/osm_sa_multipath_record.c
index e9ddea5..214a82b 100644
--- a/opensm/opensm/osm_sa_multipath_record.c
+++ b/opensm/opensm/osm_sa_multipath_record.c
@@ -533,7 +533,7 @@ __osm_mpr_rcv_get_path_parms(IN osm_sa_t * sa,
 	else if (p_qos_level && p_qos_level->pkt_life_set)
 		pkt_life = p_qos_level->pkt_life;
 	else
-		pkt_life = OSM_DEFAULT_SUBNET_TIMEOUT;
+		pkt_life = sa->p_subn->opt.subnet_timeout;
 
 	/* we silently ignore cases where only the PktLife selector is defined */
 	if ((comp_mask & IB_MPR_COMPMASK_PKTLIFETIMESELEC) &&
diff --git a/opensm/opensm/osm_sa_path_record.c b/opensm/opensm/osm_sa_path_record.c
index 8ed44f4..45208f5 100644
--- a/opensm/opensm/osm_sa_path_record.c
+++ b/opensm/opensm/osm_sa_path_record.c
@@ -452,7 +452,7 @@ __osm_pr_rcv_get_path_parms(IN osm_sa_t * sa,
 	else if (p_qos_level && p_qos_level->pkt_life_set)
 		pkt_life = p_qos_level->pkt_life;
 	else
-		pkt_life = OSM_DEFAULT_SUBNET_TIMEOUT;
+		pkt_life = sa->p_subn->opt.subnet_timeout;
 
 	/*
 	   Determine if these values meet the user criteria