{MTHCA] Always set IB_QP_MIN_RNR_TIMER when in RTR

git-svn-id: svn://openib.tc.cornell.edu/gen1@375 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mthca/kernel/hca_data.c b/trunk/hw/mthca/kernel/hca_data.c
index 269a57feae9c7380b99d47dbce9819630db0e283..939cd399411b77959f2716e0f234f27b075b65da 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_data.c
+++ b/trunk/hw/mthca/kernel/hca_data.c
@@ -522,10 +522,8 @@ mlnx_conv_qp_modify_attr(
                                qp_attr_p->retry_cnt            = modify_attr_p->state.rtr.primary_av.conn.seq_err_retry_cnt; // MTU\r
                                qp_attr_p->rnr_retry            = modify_attr_p->state.rtr.primary_av.conn.rnr_retry_cnt; // MTU\r
 \r
-                               // IB_QP_MIN_RNR_TIMER\r
-                               if (modify_attr_p->state.rtr.opts & IB_MOD_QP_RNR_NAK_TIMEOUT) {\r
-                                       qp_attr_p->min_rnr_timer         = modify_attr_p->state.rtr.rnr_nak_timeout;\r
-                               }\r
+                               // IB_QP_MIN_RNR_TIMER, required in RTR, optional in RTS.\r
+                               qp_attr_p->min_rnr_timer         = modify_attr_p->state.rtr.rnr_nak_timeout;\r
 \r
                                // IB_QP_ACCESS_FLAGS: Convert Remote Atomic Flags\r
                                if (modify_attr_p->state.rtr.opts & IB_MOD_QP_ACCESS_CTRL) {\r