[MT23108] RNR NAK timeout is required in RTR transition.

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

diff --git a/trunk/hw/mt23108/kernel/hca_data.c b/trunk/hw/mt23108/kernel/hca_data.c
index 662f6df739b6b09cf58156cd7208e8fd60d66e92..0a645663ede02445b24b5590cd85bc52e0ea821d 100644 (file)
--- a/trunk/hw/mt23108/kernel/hca_data.c
+++ b/trunk/hw/mt23108/kernel/hca_data.c
@@ -1792,14 +1792,7 @@ mlnx_conv_qp_modify_attr(
                qp_attr_p->dest_qp_num     = cl_ntoh32 (modify_attr_p->state.rtr.dest_qp);\r
                qp_attr_p->qp_ous_rd_atom = modify_attr_p->state.rtr.resp_res;\r
 \r
-               if (modify_attr_p->state.rtr.opts & IB_MOD_QP_RNR_NAK_TIMEOUT)\r
-               {\r
-                       *attr_mask_p |= QP_ATTR_MIN_RNR_TIMER;\r
-                       qp_attr_p->min_rnr_timer   = modify_attr_p->state.rtr.rnr_nak_timeout;\r
-               } else\r
-               {\r
-                       qp_attr_p->min_rnr_timer   = 0;\r
-               }\r
+               qp_attr_p->min_rnr_timer   = modify_attr_p->state.rtr.rnr_nak_timeout;\r
 \r
 #if 1\r
                CL_TRACE(MLNX_DBG_QPN, g_mlnx_dbg_lvl, ("modify_qp: hh_dest 0x%x = ibal_dest 0x%x\n",\r