[openib-general] [PATCH] OpenSM: Another change for IB router support

[Hal Rosenstock]

OpenSM: Another change for IB router support

Handle HOQLife and VLStallCount for IB router ports like CA ports

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

Index: include/opensm/osm_subnet.h
===================================================================
--- include/opensm/osm_subnet.h	(revision 9769)
+++ include/opensm/osm_subnet.h	(working copy)
@@ -358,21 +358,21 @@ typedef struct _osm_subn_opt
 *	leaf_vl_stall_count
 *		The number of sequential packets dropped that cause the port
 *		to enter the VLStalled state. This is for switch ports driving
-*		a CA port.
+*		a CA or router port.
 *
 *	head_of_queue_lifetime
 *		The maximal time a packet can live at the head of a VL queue
-*		on any port not driving a CA port
+*		on any port not driving a CA or router port.
 *
 *	leaf_head_of_queue_lifetime
 *		The maximal time a packet can live at the head of a VL queue
-*		on switch ports driving a CA
+*		on switch ports driving a CA or router.
 *
 *	local_phy_errors_threshold
 *		Threshold of local phy errors for sending Trap 129
 *
 *	overrun_errors_threshold
-*		Threshold of credits over-run errors for sending Trap 129
+*		Threshold of credits overrun errors for sending Trap 129
 *
 *	sminfo_polling_timeout
 *		Specifies the polling timeout (in milliseconds) - the timeout
Index: opensm/osm_subnet.c
===================================================================
--- opensm/osm_subnet.c	(revision 9769)
+++ opensm/osm_subnet.c	(working copy)
@@ -1040,8 +1040,8 @@ osm_subn_write_conf_file(
     "vl_stall_count 0x%02x\n\n"
     "# The number of sequential packets dropped that cause the port\n"
     "# to enter the VLStalled state. This value is for switch ports\n"
-    "# driving a CA port. The result of setting this value to zero\n"
-    "# is undefined.\n"
+    "# driving a CA or router port. The result of setting this value\n"
+    "# to zero is undefined.\n"
     "leaf_vl_stall_count 0x%02x\n\n"
     "# The code of maximal time a packet can wait at the head of\n"
     "# transmission queue. \n"
@@ -1049,7 +1049,7 @@ osm_subn_write_conf_file(
     "# The value 0x14 disables this mechanism\n"          
     "head_of_queue_lifetime 0x%02x\n\n"
     "# The maximal time a packet can wait at the head of queue on \n"
-    "# switch port connected to a CA port\n"
+    "# 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"
     "max_op_vls %u\n\n"
Index: opensm/osm_link_mgr.c
===================================================================
--- opensm/osm_link_mgr.c	(revision 9769)
+++ opensm/osm_link_mgr.c	(working copy)
@@ -269,8 +269,9 @@ __osm_link_mgr_set_physp_pi(
       else if (osm_node_get_type(osm_physp_get_node_ptr(p_physp)) ==
                IB_NODE_TYPE_SWITCH)
      {
-       if (osm_node_get_type(osm_physp_get_node_ptr(p_remote_physp)) ==
-           IB_NODE_TYPE_CA)
+       /* Is remote end CA or router ? */
+       if (osm_node_get_type(osm_physp_get_node_ptr(p_remote_physp)) != 
+            IB_NODE_TYPE_SWITCH)
        {
          ib_port_info_set_hoq_lifetime(
            p_pi, p_mgr->p_subn->opt.leaf_head_of_queue_lifetime);