[ofa-general] [PATCH] osm: moving call to QoS policy file parser to osm_qos_setup()

[Yevgeny Kliteynik]

When QoS policy is being set up, partitions have to already exist.
Moving call to policy file parser from osm_subn_rescan_conf_files()
to osm_qos_setup().

Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
---
 opensm/opensm/osm_qos.c    |    4 ++++
 opensm/opensm/osm_subnet.c |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opensm/opensm/osm_qos.c b/opensm/opensm/osm_qos.c
index c6641fc..1c1e1f1 100644
--- a/opensm/opensm/osm_qos.c
+++ b/opensm/opensm/osm_qos.c
@@ -52,6 +52,7 @@
 #include <complib/cl_debug.h>
 #include <opensm/osm_opensm.h>
 #include <opensm/osm_subnet.h>
+#include <opensm/osm_qos_policy.h>

 struct qos_config {
 	uint8_t max_vls;
@@ -296,6 +297,9 @@ osm_signal_t osm_qos_setup(osm_opensm_t * p_osm)

 	cl_plock_excl_acquire(&p_osm->lock);

+	/* read QoS policy config file */
+	osm_qos_parse_policy_file(&p_osm->subn);
+
 	p_tbl = &p_osm->subn.port_guid_tbl;
 	p_next = cl_qmap_head(p_tbl);
 	while (p_next != cl_qmap_end(p_tbl)) {
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index 0f109a5..15aecf2 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -741,10 +741,6 @@ ib_api_status_t osm_subn_rescan_conf_files(IN osm_subn_t * const p_subn)
 	}
 	fclose(opts_file);

-	/* read QoS policy config file */
-	if (p_subn->opt.qos)
-		osm_qos_parse_policy_file(p_subn);
-
 	return IB_SUCCESS;
 }

-- 
1.5.1.4