[ofa-general] [PATCH 0/2] osm_port.c: do not enforce PortInfo update if max_op_vls = 0

[Doron Shoham]

do not enforce PortInfo update if max_op_vls = 0

Signed-off-by: Doron Shoham <dorons at voltaire.com>
---
 opensm/opensm/osm_port.c   |    2 +-
 opensm/opensm/osm_subnet.c |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/opensm/opensm/osm_port.c b/opensm/opensm/osm_port.c
index 4d1bbf2..8bf1767 100644
--- a/opensm/opensm/osm_port.c
+++ b/opensm/opensm/osm_port.c
@@ -383,7 +383,7 @@ uint8_t osm_physp_calc_link_op_vls(IN osm_log_t * p_log,
 		op_vls = 1;
 	}
 	/* support user limitation of max_op_vls */
-	if (op_vls > p_subn->opt.max_op_vls)
+	if (p_subn->opt.max_op_vls && op_vls > p_subn->opt.max_op_vls)
 		op_vls = p_subn->opt.max_op_vls;
 
 
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index ec15f8a..71fc7a0 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -1288,6 +1288,14 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t *const p_opts)
 		"# switch port connected to a CA or router port\n"
 		"leaf_head_of_queue_lifetime 0x%02x\n\n"
 		"# Limit the maximal operational VLs\n"
+		"# Virtual Lanes operational on this port\n"
+		"# Values are (IB Spec 1.2.1, 14.2.5.6 Table 146 \"PortInfo\")\n"
+		"#    0: No change; valid only on Set()\n"
+		"#    1: VL0\n"
+		"#    2: VL0, VL1\n"
+		"#    3: VL0 - VL3\n"
+		"#    4: VL0 - VL7\n"
+		"#    5: VL0 - VL14\n"
 		"max_op_vls %u\n\n"
 		"# Force PortInfo:LinkSpeedEnabled on switch ports\n"
 		"# If 0, don't modify PortInfo:LinkSpeedEnabled on switch port\n"
-- 
1.5.4