[openib-general] [PATCH][17/26] kDAPL: Remove typedef DAT_CR_ARRIVAL_EVENT_DATA

[Tom Duffy]

Signed-off-by: Tom Duffy <tduffy at sun.com>

diff -Nur -X /home/tduffy/dontdiff linux-kernel16/dat/dat.h linux-kernel17/dat/dat.h
--- linux-kernel16/dat/dat.h	2005-05-09 13:19:22.189961000 -0700
+++ linux-kernel17/dat/dat.h	2005-05-09 13:23:46.473960000 -0700
@@ -794,7 +794,7 @@
 } DAT_SP_HANDLE;
 
     /* Connection Request Arrival event data */
-typedef struct dat_cr_arrival_event_data {
+struct dat_cr_arrival_event_data {
 	/* Handle to the Service Point that received the Connection Request
 	 * from the remote side. If the Service Point was Reserved, sp is
 	 * DAT_HANDLE_NULL because the reserved Service Point is
@@ -817,7 +817,7 @@
 	 * to dat_cr_accept or dat_cr_reject of the Connection Request.
 	 */
 	DAT_CR_HANDLE cr_handle;
-} DAT_CR_ARRIVAL_EVENT_DATA;
+};
 
     /* Connection event data */
 typedef struct dat_connection_event_data {
@@ -906,7 +906,7 @@
 typedef union dat_event_data {
 	struct dat_dto_completion_event_data dto_completion_event_data;
 	struct dat_rmr_bind_completion_event_data rmr_completion_event_data;
-	DAT_CR_ARRIVAL_EVENT_DATA cr_arrival_event_data;
+	struct dat_cr_arrival_event_data cr_arrival_event_data;
 	DAT_CONNECTION_EVENT_DATA connect_event_data;
 	DAT_ASYNCH_ERROR_EVENT_DATA asynch_error_event_data;
 	DAT_SOFTWARE_EVENT_DATA software_event_data;
diff -Nur -X /home/tduffy/dontdiff linux-kernel16/test/dapltest/include/dapl_fft_util.h linux-kernel17/test/dapltest/include/dapl_fft_util.h
--- linux-kernel16/test/dapltest/include/dapl_fft_util.h	2005-04-06 22:02:36.589960000 -0700
+++ linux-kernel17/test/dapltest/include/dapl_fft_util.h	2005-05-09 13:23:19.226964000 -0700
@@ -64,7 +64,7 @@
     DAT_COUNT count;
     DAT_CR_HANDLE cr_handle;
     Bpool *bpool;
-    DAT_CR_ARRIVAL_EVENT_DATA cr_stat;
+    struct dat_cr_arrival_event_data cr_stat;
     DAT_EVENT_NUMBER event_num;
     DAT_IA_ADDRESS_PTR remote_netaddr;
     Per_Test_Data_t *pt_ptr;
diff -Nur -X /home/tduffy/dontdiff linux-kernel16/test/dapltest/include/dapl_proto.h linux-kernel17/test/dapltest/include/dapl_proto.h
--- linux-kernel16/test/dapltest/include/dapl_proto.h	2005-05-09 13:20:14.136964000 -0700
+++ linux-kernel17/test/dapltest/include/dapl_proto.h	2005-05-09 13:24:33.942968000 -0700
@@ -376,7 +376,7 @@
 
 bool            DT_cr_event_wait (DT_Tdep_Print_Head* phead, 
 				DAT_EVD_HANDLE evd_handle,
-				     DAT_CR_ARRIVAL_EVENT_DATA *cr_stat_p);
+				  struct dat_cr_arrival_event_data *cr_stat_p);
 
 bool            DT_dto_event_reap (DT_Tdep_Print_Head* phead, 
 				   DAT_EVD_HANDLE evd_handle,
@@ -409,7 +409,7 @@
 				  char            *message);
 
 bool            DT_cr_check (DT_Tdep_Print_Head* phead, 
-				DAT_CR_ARRIVAL_EVENT_DATA *cr_stat_p,
+				struct dat_cr_arrival_event_data *cr_stat_p,
 				DAT_PSP_HANDLE psp_handle_expected,
 				DAT_CONN_QUAL  port_expected,
 				DAT_CR_HANDLE *cr_handlep,
diff -Nur -X /home/tduffy/dontdiff linux-kernel16/test/dapltest/test/dapl_performance_server.c linux-kernel17/test/dapltest/test/dapl_performance_server.c
--- linux-kernel16/test/dapltest/test/dapl_performance_server.c	2005-05-09 13:16:40.541971000 -0700
+++ linux-kernel17/test/dapltest/test/dapl_performance_server.c	2005-05-09 13:23:19.245962000 -0700
@@ -104,7 +104,7 @@
     DAT_RSP_HANDLE              rsp_handle;
     DAT_PSP_HANDLE              psp_handle;
 
-    DAT_CR_ARRIVAL_EVENT_DATA   cr_stat;
+    struct dat_cr_arrival_event_data   cr_stat;
     DAT_CR_HANDLE               cr_handle;
     DAT_EVENT_NUMBER            event_num;
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel16/test/dapltest/test/dapl_server.c linux-kernel17/test/dapltest/test/dapl_server.c
--- linux-kernel16/test/dapltest/test/dapl_server.c	2005-05-09 13:14:52.066962000 -0700
+++ linux-kernel17/test/dapltest/test/dapl_server.c	2005-05-09 13:23:19.253960000 -0700
@@ -276,7 +276,7 @@
     for (;/* EVER */;)
     {
 	DAT_CR_HANDLE               cr_handle;
-	DAT_CR_ARRIVAL_EVENT_DATA   cr_stat;
+	struct dat_cr_arrival_event_data   cr_stat;
 	DAT_EVENT_NUMBER            event_num;
 
 	/* Set up the Per_Test_Data */
diff -Nur -X /home/tduffy/dontdiff linux-kernel16/test/dapltest/test/dapl_test_util.c linux-kernel17/test/dapltest/test/dapl_test_util.c
--- linux-kernel16/test/dapltest/test/dapl_test_util.c	2005-05-09 13:19:10.563961000 -0700
+++ linux-kernel17/test/dapltest/test/dapl_test_util.c	2005-05-09 13:23:19.258962000 -0700
@@ -250,7 +250,7 @@
 bool
 DT_cr_event_wait ( DT_Tdep_Print_Head *phead,
 		   DAT_EVD_HANDLE evd_handle,
-		   DAT_CR_ARRIVAL_EVENT_DATA *cr_stat_p)
+		   struct dat_cr_arrival_event_data *cr_stat_p)
 {
     int err_cnt;
 
@@ -658,7 +658,7 @@
  */
 bool
 DT_cr_check (  DT_Tdep_Print_Head *phead,
-		DAT_CR_ARRIVAL_EVENT_DATA *cr_stat_p,
+		struct dat_cr_arrival_event_data *cr_stat_p,
 		DAT_PSP_HANDLE  psp_handle_expected,
 		DAT_CONN_QUAL   port_expected,
 		DAT_CR_HANDLE   *cr_handlep,
diff -Nur -X /home/tduffy/dontdiff linux-kernel16/test/dapltest/test/dapl_transaction_test.c linux-kernel17/test/dapltest/test/dapl_transaction_test.c
--- linux-kernel16/test/dapltest/test/dapl_transaction_test.c	2005-05-09 13:14:52.085962000 -0700
+++ linux-kernel17/test/dapltest/test/dapl_transaction_test.c	2005-05-09 13:23:19.269962000 -0700
@@ -520,7 +520,7 @@
 	u32          buff_size  =  MAX_OPS * sizeof (RemoteMemoryInfo);
 	RemoteMemoryInfo    *RemoteMemInfo;
 	struct dat_dto_completion_event_data dto_stat;
-	DAT_CR_ARRIVAL_EVENT_DATA   cr_stat;
+	struct dat_cr_arrival_event_data   cr_stat;
 	DAT_CR_HANDLE               cr_handle;
 
 	/*