Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
diff -Nur -X /home/tduffy/dontdiff linux-kernel14/dat/dat.h
linux-kernel15/dat/dat.h
--- linux-kernel14/dat/dat.h 2005-05-09 12:58:35.516881000 -0700
+++ linux-kernel15/dat/dat.h 2005-05-09 13:15:04.793961000 -0700
@@ -774,12 +774,12 @@
/* DTO completion event data */
/* transfered_length is not defined if status is not DAT_SUCCESS */
-typedef struct dat_dto_completion_event_data {
+struct dat_dto_completion_event_data {
DAT_EP_HANDLE ep_handle;
DAT_DTO_COOKIE user_cookie;
DAT_DTO_COMPLETION_STATUS status;
DAT_VLEN transfered_length;
-} DAT_DTO_COMPLETION_EVENT_DATA;
+};
/* RMR bind completion event data */
typedef struct dat_rmr_bind_completion_event_data {
@@ -904,7 +904,7 @@
/* Union for event Data */
typedef union dat_event_data {
- DAT_DTO_COMPLETION_EVENT_DATA dto_completion_event_data;
+ struct dat_dto_completion_event_data dto_completion_event_data;
DAT_RMR_BIND_COMPLETION_EVENT_DATA rmr_completion_event_data;
DAT_CR_ARRIVAL_EVENT_DATA cr_arrival_event_data;
DAT_CONNECTION_EVENT_DATA connect_event_data;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/include/dapl_proto.h
linux-kernel15/test/dapltest/include/dapl_proto.h
--- linux-kernel14/test/dapltest/include/dapl_proto.h 2005-05-09
11:34:28.736009000 -0700
+++ linux-kernel15/test/dapltest/include/dapl_proto.h 2005-05-09
13:16:08.366963000 -0700
@@ -379,24 +379,24 @@
DAT_CR_ARRIVAL_EVENT_DATA *cr_stat_p);
bool DT_dto_event_reap (DT_Tdep_Print_Head* phead,
- DAT_EVD_HANDLE evd_handle,
- bool poll,
- DAT_DTO_COMPLETION_EVENT_DATA *dtop);
+ DAT_EVD_HANDLE evd_handle,
+ bool poll,
+ struct dat_dto_completion_event_data *dtop);
bool DT_dto_event_wait (DT_Tdep_Print_Head* phead,
- DAT_EVD_HANDLE evd_handle,
- DAT_DTO_COMPLETION_EVENT_DATA *dtop);
+ DAT_EVD_HANDLE evd_handle,
+ struct dat_dto_completion_event_data *dtop);
bool DT_dto_event_poll (DT_Tdep_Print_Head* phead,
- DAT_EVD_HANDLE evd_handle,
- DAT_DTO_COMPLETION_EVENT_DATA *dtop);
+ DAT_EVD_HANDLE evd_handle,
+ struct dat_dto_completion_event_data *dtop);
bool DT_rmr_event_wait (DT_Tdep_Print_Head* phead,
DAT_EVD_HANDLE evd_handle,
DAT_RMR_BIND_COMPLETION_EVENT_DATA *rmr_ptr);
bool DT_dto_check ( DT_Tdep_Print_Head* phead,
- DAT_DTO_COMPLETION_EVENT_DATA *dto_p,
+ struct dat_dto_completion_event_data *dto_p,
DAT_EP_HANDLE ep_expected,
DAT_COUNT len_expected,
DAT_DTO_COOKIE cookie_expected,
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_client.c
linux-kernel15/test/dapltest/test/dapl_client.c
--- linux-kernel14/test/dapltest/test/dapl_client.c 2005-05-09
12:16:33.887002000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_client.c 2005-05-09
13:14:52.046961000 -0700
@@ -60,7 +60,7 @@
unsigned int retry_cnt = 0;
DAT_DTO_COOKIE dto_cookie;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_EVENT_NUMBER event_num;
unsigned char * buffp;
DAT_RETURN ret;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_performance_client.c
linux-kernel15/test/dapltest/test/dapl_performance_client.c
--- linux-kernel14/test/dapltest/test/dapl_performance_client.c 2005-05-09
11:52:15.258003000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_performance_client.c 2005-05-09
13:16:26.034961000 -0700
@@ -367,7 +367,7 @@
DT_Tdep_Print_Head *phead,
Performance_Test_t *test_ptr)
{
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_DTO_COOKIE dto_cookie;
Performance_Stats_t stats;
RemoteMemoryInfo *rmi;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_performance_server.c
linux-kernel15/test/dapltest/test/dapl_performance_server.c
--- linux-kernel14/test/dapltest/test/dapl_performance_server.c 2005-05-05
09:42:06.502020000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_performance_server.c 2005-05-09
13:16:40.541971000 -0700
@@ -279,7 +279,7 @@
DT_Tdep_Print_Head *phead,
Performance_Test_t *test_ptr)
{
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
RemoteMemoryInfo *rmi;
DAT_DTO_COOKIE dto_cookie;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_server.c
linux-kernel15/test/dapltest/test/dapl_server.c
--- linux-kernel14/test/dapltest/test/dapl_server.c 2005-05-09
12:16:33.904000000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_server.c 2005-05-09
13:14:52.066962000 -0700
@@ -51,7 +51,7 @@
int status = 0;
DAT_DTO_COOKIE dto_cookie;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_RETURN ret;
DT_Tdep_Print_Head *phead;
@@ -870,7 +870,7 @@
{
unsigned char *module = "send_control_data";
DAT_DTO_COOKIE dto_cookie;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
buffp = DT_Bpool_GetBuffer (ps_ptr->bpool, 2); /* 3rd buffer */
memcpy ( (void *)buffp,
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_test_util.c
linux-kernel15/test/dapltest/test/dapl_test_util.c
--- linux-kernel14/test/dapltest/test/dapl_test_util.c 2005-05-09
12:31:59.724000000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_test_util.c 2005-05-09
13:14:52.072963000 -0700
@@ -414,7 +414,7 @@
DT_dto_event_reap (DT_Tdep_Print_Head *phead,
DAT_EVD_HANDLE evd_handle,
bool poll,
- DAT_DTO_COMPLETION_EVENT_DATA *dto_statusp)
+ struct dat_dto_completion_event_data *dto_statusp)
{
if (poll)
{
@@ -433,7 +433,7 @@
bool
DT_dto_event_poll (DT_Tdep_Print_Head *phead,
DAT_EVD_HANDLE evd_handle,
- DAT_DTO_COMPLETION_EVENT_DATA *dto_statusp)
+ struct dat_dto_completion_event_data *dto_statusp)
{
for (;;)
{
@@ -485,7 +485,7 @@
bool
DT_dto_event_wait (DT_Tdep_Print_Head *phead,
DAT_EVD_HANDLE evd_handle,
- DAT_DTO_COMPLETION_EVENT_DATA *dto_statusp)
+ struct dat_dto_completion_event_data *dto_statusp)
{
for (;;)
{
@@ -571,7 +571,7 @@
*/
bool
DT_dto_check ( DT_Tdep_Print_Head *phead,
- DAT_DTO_COMPLETION_EVENT_DATA *dto_p,
+ struct dat_dto_completion_event_data *dto_p,
DAT_EP_HANDLE ep_expected,
DAT_COUNT len_expected,
DAT_DTO_COOKIE cookie_expected,
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_transaction_test.c
linux-kernel15/test/dapltest/test/dapl_transaction_test.c
--- linux-kernel14/test/dapltest/test/dapl_transaction_test.c 2005-05-09
12:59:53.159964000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_transaction_test.c 2005-05-09
13:14:52.085962000 -0700
@@ -519,7 +519,7 @@
{
u32 buff_size = MAX_OPS * sizeof (RemoteMemoryInfo);
RemoteMemoryInfo *RemoteMemInfo;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_CR_ARRIVAL_EVENT_DATA cr_stat;
DAT_CR_HANDLE cr_handle;
@@ -1371,7 +1371,7 @@
}
for (i = 0; i < test_ptr->cmd->eps_per_thread; i++)
{
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
if ( !DT_dto_event_wait (phead,
test_ptr->reqt_evd_hdl,
@@ -1388,7 +1388,7 @@
test_ptr->base_port));
for (i = 0; i < test_ptr->cmd->eps_per_thread; i++)
{
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
if ( !DT_dto_event_wait (phead,
test_ptr->recv_evd_hdl,
@@ -1409,7 +1409,7 @@
test_ptr->base_port));
for (i = 0; i < test_ptr->cmd->eps_per_thread; i++)
{
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
if ( !DT_dto_event_wait (phead,
test_ptr->recv_evd_hdl,
@@ -1446,7 +1446,7 @@
}
for (i = 0; i < test_ptr->cmd->eps_per_thread; i++)
{
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
if ( !DT_dto_event_wait (phead,
test_ptr->reqt_evd_hdl,
diff -Nur -X /home/tduffy/dontdiff
linux-kernel14/test/dapltest/test/dapl_transaction_util.c
linux-kernel15/test/dapltest/test/dapl_transaction_util.c
--- linux-kernel14/test/dapltest/test/dapl_transaction_util.c 2005-05-09
11:52:52.357004000 -0700
+++ linux-kernel15/test/dapltest/test/dapl_transaction_util.c 2005-05-09
13:14:52.091965000 -0700
@@ -157,7 +157,7 @@
for (i = 0; i < num_eps; i++)
{
Transaction_Test_Op_t *op;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_DTO_COOKIE dto_cookie;
unsigned int epnum;
@@ -265,7 +265,7 @@
for (i = 0; i < num_eps; i++)
{
Transaction_Test_Op_t *op;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_DTO_COOKIE dto_cookie;
unsigned int epnum;
@@ -558,7 +558,7 @@
for (i = 0; i < num_eps; i++)
{
Transaction_Test_Op_t *op;
- DAT_DTO_COMPLETION_EVENT_DATA dto_stat;
+ struct dat_dto_completion_event_data dto_stat;
DAT_DTO_COOKIE dto_cookie;
unsigned int epnum;
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
