From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 18 Sep 2007 10:06:53 +0000 (+0000)
Subject: [IBAL] remove bit-fields from structure definition
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=588439fe679eade41a153956fa67e7ea148df2ac;p=~shefty%2Frdma-win.git

[IBAL] remove bit-fields from structure definition

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

diff --git a/branches/Ndi/core/al/kernel/al_cm_rdma.h b/branches/Ndi/core/al/kernel/al_cm_rdma.h
index 7fb69adf..953e0c5f 100644
--- a/branches/Ndi/core/al/kernel/al_cm_rdma.h
+++ b/branches/Ndi/core/al/kernel/al_cm_rdma.h
@@ -33,15 +33,13 @@
 #if !defined(__IB_AL_CM_RDMA_H__)
 #define __IB_AL_CM_RDMA_H__
 
-#define IB_REQ_CM_RDMA_PDATA_SIZE	56
+#include <iba/ib_types.h>
 
 typedef struct _cm_rdma_req
 {
-	ib_net32_t			src_port : 16;
-	ib_net32_t			res : 4;
-	ib_net32_t			ipv : 4;
-	ib_net32_t			min_ver : 4;
-	ib_net32_t			max_ver : 4;
+	ib_net16_t			src_port;
+	uint8_t				ipv;			/* resides in bits 4-7 */
+	uint8_t				maj_min_ver;	/* min_ver: bits 0-3, maj_ver: bits 4-7 */
 	ib_net32_t			src_ip_addr[4];
 	ib_net32_t			dst_ip_addr[4];
 	uint8_t				pdata[IB_REQ_CM_RDMA_PDATA_SIZE];
diff --git a/branches/Ndi/inc/iba/ib_types.h b/branches/Ndi/inc/iba/ib_types.h
index e84252b1..2442e3b5 100644
--- a/branches/Ndi/inc/iba/ib_types.h
+++ b/branches/Ndi/inc/iba/ib_types.h
@@ -8394,6 +8394,7 @@ typedef struct _ib_ioc_info
 /*
  *	Defines the size of user available data in communication management MADs
  */
+#define IB_REQ_CM_RDMA_PDATA_SIZE			56
 #define IB_REQ_PDATA_SIZE					92
 #define IB_MRA_PDATA_SIZE					222
 #define IB_REJ_PDATA_SIZE					148