Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
diff -Nur -X /home/tduffy/dontdiff linux-kernel3/dat/dat.h
linux-kernel4/dat/dat.h
--- linux-kernel3/dat/dat.h 2005-05-09 11:36:42.184000000 -0700
+++ linux-kernel4/dat/dat.h 2005-05-09 11:50:52.631016000 -0700
@@ -531,12 +531,12 @@
DAT_VLEN segment_length;
};
-typedef struct dat_rmr_triplet {
+struct dat_rmr_triplet {
DAT_RMR_CONTEXT rmr_context;
u32 pad; /* align structure on 64-bit boundry */
DAT_VADDR target_address;
DAT_VLEN segment_length;
-} DAT_RMR_TRIPLET;
+};
typedef enum dat_mem_type {
DAT_MEM_TYPE_VIRTUAL = 0x00,
@@ -1177,11 +1177,11 @@
typedef DAT_RETURN (*DAT_EP_POST_RDMA_READ_FUNC) (
DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
- const DAT_RMR_TRIPLET *, DAT_COMPLETION_FLAGS);
+ const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
typedef DAT_RETURN (*DAT_EP_POST_RDMA_WRITE_FUNC) (
DAT_EP_HANDLE, DAT_COUNT, struct dat_lmr_triplet *, DAT_DTO_COOKIE,
- const DAT_RMR_TRIPLET *, DAT_COMPLETION_FLAGS);
+ const struct dat_rmr_triplet *, DAT_COMPLETION_FLAGS);
typedef DAT_RETURN (*DAT_EP_GET_STATUS_FUNC) (
DAT_EP_HANDLE, DAT_EP_STATE *, DAT_BOOLEAN *, DAT_BOOLEAN *);
@@ -1593,7 +1593,7 @@
DAT_COUNT size,
struct dat_lmr_triplet
*local_iov,
DAT_DTO_COOKIE cookie,
- const DAT_RMR_TRIPLET *
remote_iov,
+ const struct dat_rmr_triplet
*remote_iov,
DAT_COMPLETION_FLAGS flags)
{
return DAT_CALL_PROVIDER_FUNC(ep_post_rdma_read_func, ep, size,
@@ -1604,7 +1604,7 @@
DAT_COUNT size,
struct dat_lmr_triplet
*local_iov,
DAT_DTO_COOKIE cookie,
- const DAT_RMR_TRIPLET *
remote_iov,
+ const struct dat_rmr_triplet
*remote_iov,
DAT_COMPLETION_FLAGS flags)
{
return DAT_CALL_PROVIDER_FUNC(ep_post_rdma_write_func, ep, size,
diff -Nur -X /home/tduffy/dontdiff
linux-kernel3/dat-provider/dapl_ep_post_rdma_read.c
linux-kernel4/dat-provider/dapl_ep_post_rdma_read.c
--- linux-kernel3/dat-provider/dapl_ep_post_rdma_read.c 2005-05-09
11:37:00.776002000 -0700
+++ linux-kernel4/dat-provider/dapl_ep_post_rdma_read.c 2005-05-09
11:51:08.142014000 -0700
@@ -71,7 +71,7 @@
DAT_COUNT num_segments,
struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
- const DAT_RMR_TRIPLET * remote_iov,
+ const struct dat_rmr_triplet *remote_iov,
DAT_COMPLETION_FLAGS completion_flags)
{
diff -Nur -X /home/tduffy/dontdiff
linux-kernel3/dat-provider/dapl_ep_post_rdma_write.c
linux-kernel4/dat-provider/dapl_ep_post_rdma_write.c
--- linux-kernel3/dat-provider/dapl_ep_post_rdma_write.c 2005-05-09
11:37:10.118025000 -0700
+++ linux-kernel4/dat-provider/dapl_ep_post_rdma_write.c 2005-05-09
11:51:17.541031000 -0700
@@ -71,7 +71,7 @@
DAT_COUNT num_segments,
struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
- const DAT_RMR_TRIPLET * remote_iov,
+ const struct dat_rmr_triplet *remote_iov,
DAT_COMPLETION_FLAGS completion_flags)
{
DAT_RETURN dat_status;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel3/dat-provider/dapl_ep_post_send.c
linux-kernel4/dat-provider/dapl_ep_post_send.c
--- linux-kernel3/dat-provider/dapl_ep_post_send.c 2005-05-09
11:37:33.432060000 -0700
+++ linux-kernel4/dat-provider/dapl_ep_post_send.c 2005-05-09
11:49:45.248005000 -0700
@@ -70,7 +70,7 @@
DAT_DTO_COOKIE user_cookie,
DAT_COMPLETION_FLAGS completion_flags)
{
- DAT_RMR_TRIPLET remote_iov = { 0, 0, 0, 0 };
+ struct dat_rmr_triplet remote_iov = { 0, 0, 0, 0 };
DAT_RETURN dat_status;
dapl_dbg_log(DAPL_DBG_TYPE_API,
diff -Nur -X /home/tduffy/dontdiff linux-kernel3/dat-provider/dapl_ep_util.c
linux-kernel4/dat-provider/dapl_ep_util.c
--- linux-kernel3/dat-provider/dapl_ep_util.c 2005-05-09 11:37:43.486003000
-0700
+++ linux-kernel4/dat-provider/dapl_ep_util.c 2005-05-09 11:51:34.946002000
-0700
@@ -289,7 +289,7 @@
DAT_COUNT num_segments,
struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
- const DAT_RMR_TRIPLET * remote_iov,
+ const struct dat_rmr_triplet *remote_iov,
DAT_COMPLETION_FLAGS completion_flags,
DAPL_DTO_TYPE dto_type, int op_type)
{
diff -Nur -X /home/tduffy/dontdiff linux-kernel3/dat-provider/dapl_ep_util.h
linux-kernel4/dat-provider/dapl_ep_util.h
--- linux-kernel3/dat-provider/dapl_ep_util.h 2005-05-09 11:37:53.155002000
-0700
+++ linux-kernel4/dat-provider/dapl_ep_util.h 2005-05-09 11:51:45.071013000
-0700
@@ -57,7 +57,7 @@
DAT_COUNT num_segments,
struct dat_lmr_triplet *local_iov,
DAT_DTO_COOKIE user_cookie,
- const DAT_RMR_TRIPLET * remote_iov,
+ const struct dat_rmr_triplet *remote_iov,
DAT_COMPLETION_FLAGS completion_flags,
DAPL_DTO_TYPE dto_type, int op_type);
diff -Nur -X /home/tduffy/dontdiff linux-kernel3/dat-provider/dapl.h
linux-kernel4/dat-provider/dapl.h
--- linux-kernel3/dat-provider/dapl.h 2005-05-09 11:34:28.653042000 -0700
+++ linux-kernel4/dat-provider/dapl.h 2005-05-09 11:49:45.236005000 -0700
@@ -605,14 +605,14 @@
DAT_COUNT, /* num_segments */
struct dat_lmr_triplet *, /*
local_iov */
DAT_DTO_COOKIE, /* user_cookie
*/
- const DAT_RMR_TRIPLET *, /*
remote_iov */
+ const struct dat_rmr_triplet *,
/* remote_iov */
DAT_COMPLETION_FLAGS); /*
completion_flags */
extern DAT_RETURN dapl_ep_post_rdma_write(DAT_EP_HANDLE, /* ep_handle */
DAT_COUNT, /* num_segments */
struct dat_lmr_triplet *, /*
local_iov */
DAT_DTO_COOKIE, /* user_cookie
*/
- const DAT_RMR_TRIPLET *, /*
remote_iov */
+ const struct dat_rmr_triplet *,
/* remote_iov */
DAT_COMPLETION_FLAGS); /*
completion_flags */
extern DAT_RETURN dapl_ep_get_status(DAT_EP_HANDLE, /* ep_handle */
diff -Nur -X /home/tduffy/dontdiff linux-kernel3/dat-provider/dapl_openib_dto.h
linux-kernel4/dat-provider/dapl_openib_dto.h
--- linux-kernel3/dat-provider/dapl_openib_dto.h 2005-05-09
11:38:52.342013000 -0700
+++ linux-kernel4/dat-provider/dapl_openib_dto.h 2005-05-09
11:52:00.134000000 -0700
@@ -106,7 +106,7 @@
DAPL_COOKIE * cookie,
DAT_COUNT num_segments,
struct dat_lmr_triplet *local_iov,
- const DAT_RMR_TRIPLET * remote_iov,
+ const struct dat_rmr_triplet *remote_iov,
DAT_COMPLETION_FLAGS completion_flags)
{
struct ib_send_wr send_desc = { NULL };
diff -Nur -X /home/tduffy/dontdiff
linux-kernel3/test/dapltest/test/dapl_performance_client.c
linux-kernel4/test/dapltest/test/dapl_performance_client.c
--- linux-kernel3/test/dapltest/test/dapl_performance_client.c 2005-05-09
11:45:05.677016000 -0700
+++ linux-kernel4/test/dapltest/test/dapl_performance_client.c 2005-05-09
11:52:15.258003000 -0700
@@ -253,7 +253,7 @@
Performance_Stats_t *stats )
{
struct dat_lmr_triplet *iov;
- DAT_RMR_TRIPLET rmr_triplet;
+ struct dat_rmr_triplet rmr_triplet;
DAT_DTO_COOKIE cookie;
DAT_EVENT event;
DAT_RETURN ret;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel3/test/dapltest/test/dapl_performance_util.c
linux-kernel4/test/dapltest/test/dapl_performance_util.c
--- linux-kernel3/test/dapltest/test/dapl_performance_util.c 2005-05-09
11:45:34.287003000 -0700
+++ linux-kernel4/test/dapltest/test/dapl_performance_util.c 2005-05-09
11:52:38.934000000 -0700
@@ -430,7 +430,7 @@
DAT_RETURN ret;
Performance_Test_Op_t *op = &ep_context->op;
struct dat_lmr_triplet *iov = DT_Bpool_GetIOV(op->bp, 0);
- DAT_RMR_TRIPLET rmr_triplet;
+ struct dat_rmr_triplet rmr_triplet;
bytes = op->seg_size * op->num_segs;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel3/test/dapltest/test/dapl_transaction_util.c
linux-kernel4/test/dapltest/test/dapl_transaction_util.c
--- linux-kernel3/test/dapltest/test/dapl_transaction_util.c 2005-05-09
11:46:47.629003000 -0700
+++ linux-kernel4/test/dapltest/test/dapl_transaction_util.c 2005-05-09
11:52:52.357004000 -0700
@@ -486,7 +486,7 @@
Transaction_Test_Op_t *op = &ep_context[i].op[op_indx];
struct dat_lmr_triplet *iov = DT_Bpool_GetIOV (op->bp, 0);
DAT_DTO_COOKIE cookie;
- DAT_RMR_TRIPLET rmr_triplet;
+ struct dat_rmr_triplet rmr_triplet;
/* Prep the inputs */
for (j = 0; j < op->num_segs; j++)
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
