From: tzachid <tzachid@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Sun, 23 Sep 2007 08:51:48 +0000 (+0000)
Subject: [WSD] Rename some structures to make the code more readable.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3c097a85afe1fa46f62fadf53f9003ba9bc42836;p=~shefty%2Frdma-win.git

[WSD] Rename some structures to make the code more readable.

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

diff --git a/trunk/ulp/wsd/user/extensions.c b/trunk/ulp/wsd/user/extensions.c
index 2839ce8c..c5486911 100644
--- a/trunk/ulp/wsd/user/extensions.c
+++ b/trunk/ulp/wsd/user/extensions.c
@@ -245,8 +245,8 @@ IBSPRegisterRdmaMemory(
 	desc = lpRdmaBufferDescriptor;
 
 	desc->iova = (uint64_t) (uintptr_t) lpBuffer;
-	desc->lkey = node2->p_reg->lkey;
-	desc->rkey = node2->p_reg->rkey;
+	desc->lkey = node2->p_reg1->lkey;
+	desc->rkey = node2->p_reg1->rkey;
 	desc->node1 = node2;
 
 	*lpErrno = 0;
@@ -417,7 +417,7 @@ do_rdma_op(
 		local_ds[ds_idx].vaddr = (uint64_t)(void* __ptr64)lpBuffers[ds_idx].buf;
 		local_ds[ds_idx].length = lpBuffers[ds_idx].len;
 		local_ds[ds_idx].lkey =
-			((struct memory_node*)lpBuffers[ds_idx].handle)->p_reg->lkey;
+			((struct memory_node*)lpBuffers[ds_idx].handle)->p_reg1->lkey;
 
 		lpOverlapped->InternalHigh += lpBuffers[ds_idx].len;
 	}
diff --git a/trunk/ulp/wsd/user/ibsp_mem.c b/trunk/ulp/wsd/user/ibsp_mem.c
index 375bbe90..30782b18 100644
--- a/trunk/ulp/wsd/user/ibsp_mem.c
+++ b/trunk/ulp/wsd/user/ibsp_mem.c
@@ -78,8 +78,8 @@ lookup_partial_mr(
 		p_item = cl_qlist_next( p_item ) )
 	{
 		p_node = PARENT_STRUCT( p_item, struct memory_node, socket_item );
-		if(p_node->p_reg &&
-			__check_mr( p_node->p_reg, acl_mask, start, len ) )
+		if(p_node->p_reg1 &&
+			__check_mr( p_node->p_reg1, acl_mask, start, len ) )
 		{
 			cl_spinlock_release( &s->port->hca->rdma_mem_list.mutex );
 			IBSP_EXIT( IBSP_DBG_MEM );
@@ -140,7 +140,7 @@ ibsp_reg_mem(
 
 		if( __check_mr( p_reg, access_ctrl, start, len ) )
 		{
-			p_node->p_reg = p_reg;
+			p_node->p_reg1 = p_reg;
 			p_node->s = s;
 			cl_qlist_insert_tail( &p_reg->node_list, &p_node->mr_item );
 			cl_qlist_insert_head(
@@ -189,7 +189,7 @@ ibsp_reg_mem(
 
 	STAT_INC( mr_num );
 
-	p_node->p_reg = p_reg;
+	p_node->p_reg1 = p_reg;
 	p_node->s = s;
 
 	/* Link to the list of nodes. */
@@ -211,8 +211,8 @@ static inline int __ibsp_dereg_mem_mr(
 	IBSP_ENTER( IBSP_DBG_MEM );
 
 	// Underlying registration could be freed before the node.
-	if( node->p_reg )
-		cl_qlist_remove_item( &node->p_reg->node_list, &node->mr_item );
+	if( node->p_reg1 )
+		cl_qlist_remove_item( &node->p_reg1->node_list, &node->mr_item );
 
 	cl_qlist_remove_item( &node->s->mr_list, &node->socket_item );
 
@@ -278,7 +278,7 @@ ibsp_dereg_hca(
 		{
 			struct memory_node *p_node =
 				PARENT_STRUCT( item1, struct memory_node, mr_item );
-			p_node->p_reg = NULL;
+			p_node->p_reg1 = NULL;
 		}
 
 		IBSP_PRINT(TRACE_LEVEL_INFORMATION, IBSP_DBG_MEM, ("unpinning ,memory reg %p\n", p_reg) );
@@ -379,7 +379,7 @@ ibsp_hca_flush_mr_cache(
 			struct memory_node *p_node =
 				PARENT_STRUCT( p_item1, struct memory_node, mr_item );
 
-			p_node->p_reg = NULL;
+			p_node->p_reg1 = NULL;
 		}
 
 		cl_qlist_remove_item( &p_hca->rdma_mem_list.list, &p_reg->item );
diff --git a/trunk/ulp/wsd/user/ibspdll.c b/trunk/ulp/wsd/user/ibspdll.c
index ae427640..1843e201 100644
--- a/trunk/ulp/wsd/user/ibspdll.c
+++ b/trunk/ulp/wsd/user/ibspdll.c
@@ -1645,7 +1645,7 @@ IBSPRecv(
 		wr->ds_array[ds_idx].vaddr =
 			(uint64_t)(void* __ptr64)lpBuffers[ds_idx].buf;
 		wr->ds_array[ds_idx].length = lpBuffers[ds_idx].len;
-		wr->ds_array[ds_idx].lkey = node->p_reg->lkey;
+		wr->ds_array[ds_idx].lkey = node->p_reg1->lkey;
 	}
 
 	/*
@@ -1876,7 +1876,7 @@ IBSPSend(
 				return SOCKET_ERROR;
 			}
 
-			local_ds[ds_idx].lkey = node->p_reg->lkey;
+			local_ds[ds_idx].lkey = node->p_reg1->lkey;
 		}
 	}
 
diff --git a/trunk/ulp/wsd/user/ibspstruct.h b/trunk/ulp/wsd/user/ibspstruct.h
index 867267d7..46fb0e56 100644
--- a/trunk/ulp/wsd/user/ibspstruct.h
+++ b/trunk/ulp/wsd/user/ibspstruct.h
@@ -184,7 +184,7 @@ struct memory_node
 	struct ibsp_socket_info	*s;
 	/* List item to track within the registration structure. */
 	cl_list_item_t			mr_item;
-	struct memory_reg		*p_reg;
+	struct memory_reg		*p_reg1;
 };