From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Mon, 10 Apr 2006 13:48:51 +0000 (+0000)
Subject: [MTHCA] fixed bugs in modify_QP, mostly related to RDMA
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d3089972e5f76a21f620efdea0f8343c4db48e68;p=~shefty%2Frdma-win.git

[MTHCA] fixed bugs in modify_QP, mostly related to RDMA

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

diff --git a/trunk/hw/mthca/kernel/hca_data.c b/trunk/hw/mthca/kernel/hca_data.c
index 1fea7e85..26dfdb64 100644
--- a/trunk/hw/mthca/kernel/hca_data.c
+++ b/trunk/hw/mthca/kernel/hca_data.c
@@ -527,7 +527,7 @@ mlnx_conv_qp_modify_attr(
 				// IB_QP_ACCESS_FLAGS: Convert Remote Atomic Flags
 				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_ACCESS_CTRL) {
 					*qp_attr_mask_p |= IB_QP_ACCESS_FLAGS;		/* optional flag */
-					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.init.access_ctrl);
+					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.rtr.access_ctrl);
 				}
 
 				// IB_QP_ALT_PATH: Convert alternate RC AV
@@ -573,7 +573,7 @@ mlnx_conv_qp_modify_attr(
 				// IB_QP_ACCESS_FLAGS: Convert Remote Atomic Flags
 				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_ACCESS_CTRL) {
 					*qp_attr_mask_p |= IB_QP_ACCESS_FLAGS;		/* optional flag */
-					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.init.access_ctrl);
+					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.rtr.access_ctrl);
 				}
 
 				// IB_QP_ALT_PATH: Convert alternate RC AV
@@ -652,20 +652,20 @@ mlnx_conv_qp_modify_attr(
 		// Linux patch 4793: PKEY_INDEX is not a legal parameter in the RTR->RTS transition.
 
 				// IB_QP_PKEY_INDEX 
-				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_PKEY) {
+				if (modify_attr_p->state.rts.opts & IB_MOD_QP_PKEY) {
 					*qp_attr_mask_p |= IB_QP_PKEY_INDEX;	
 					qp_attr_p->pkey_index = modify_attr_p->state.rts.pkey_index;
 				}
 #endif				
 
 				// IB_QP_MIN_RNR_TIMER
-				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_RNR_NAK_TIMEOUT) {
+				if (modify_attr_p->state.rts.opts & IB_MOD_QP_RNR_NAK_TIMEOUT) {
 					*qp_attr_mask_p |= IB_QP_MIN_RNR_TIMER;	
 					qp_attr_p->min_rnr_timer	 = modify_attr_p->state.rts.rnr_nak_timeout;
 				}
 
 				// IB_QP_PATH_MIG_STATE
-				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_APM_STATE) {
+				if (modify_attr_p->state.rts.opts & IB_MOD_QP_APM_STATE) {
 					*qp_attr_mask_p |= IB_QP_PATH_MIG_STATE;	
 					qp_attr_p->path_mig_state =  modify_attr_p->state.rts.apm_state;
 				}
@@ -673,7 +673,7 @@ mlnx_conv_qp_modify_attr(
 				// IB_QP_ACCESS_FLAGS
 				if (modify_attr_p->state.rts.opts & IB_MOD_QP_ACCESS_CTRL) {
 					*qp_attr_mask_p |= IB_QP_ACCESS_FLAGS;		/* optional flags */
-					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.init.access_ctrl);
+					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.rts.access_ctrl);
 				}
 
 				// IB_QP_ALT_PATH: Convert alternate RC AV
@@ -704,14 +704,14 @@ mlnx_conv_qp_modify_attr(
 		// Linux patch 4793: PKEY_INDEX is not a legal parameter in the RTR->RTS transition.
 
 				// IB_QP_PKEY_INDEX 
-				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_PKEY) {
+				if (modify_attr_p->state.rts.opts & IB_MOD_QP_PKEY) {
 					*qp_attr_mask_p |= IB_QP_PKEY_INDEX;	
 					qp_attr_p->pkey_index = modify_attr_p->state.rts.pkey_index;
 				}
 #endif				
 
 				// IB_QP_PATH_MIG_STATE
-				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_APM_STATE) {
+				if (modify_attr_p->state.rts.opts & IB_MOD_QP_APM_STATE) {
 					*qp_attr_mask_p |= IB_QP_PATH_MIG_STATE;	
 					qp_attr_p->path_mig_state =  modify_attr_p->state.rts.apm_state;
 				}
@@ -719,7 +719,7 @@ mlnx_conv_qp_modify_attr(
 				// IB_QP_ACCESS_FLAGS
 				if (modify_attr_p->state.rts.opts & IB_MOD_QP_ACCESS_CTRL) {
 					*qp_attr_mask_p |= IB_QP_ACCESS_FLAGS;		/* optional flags */
-					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.init.access_ctrl);
+					qp_attr_p->qp_access_flags = map_qp_ibal_acl(modify_attr_p->state.rts.access_ctrl);
 				}
 
 				// IB_QP_ALT_PATH: Convert alternate RC AV
@@ -742,9 +742,9 @@ mlnx_conv_qp_modify_attr(
 					IB_QP_SQ_PSN;
 
 				// IB_QP_QKEY
-				if (modify_attr_p->state.rtr.opts & IB_MOD_QP_QKEY) {
+				if (modify_attr_p->state.rts.opts & IB_MOD_QP_QKEY) {
 					*qp_attr_mask_p |= IB_QP_QKEY;	
-					qp_attr_p->qkey 	 = cl_ntoh32 (modify_attr_p->state.rtr.qkey);
+					qp_attr_p->qkey 	 = cl_ntoh32 (modify_attr_p->state.rts.qkey);
 				}
 				break;