[openib-general] [PATCH][16/26] kDAPL: Remove typedef DAT_RMR_BIND_COMPLETION_EVENT_DATA

[Tom Duffy]

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

diff -Nur -X /home/tduffy/dontdiff linux-kernel15/dat/dat.h linux-kernel16/dat/dat.h
--- linux-kernel15/dat/dat.h	2005-05-09 13:15:04.793961000 -0700
+++ linux-kernel16/dat/dat.h	2005-05-09 13:19:22.189961000 -0700
@@ -782,11 +782,11 @@
 };
 
     /* RMR bind  completion event data */
-typedef struct dat_rmr_bind_completion_event_data {
+struct dat_rmr_bind_completion_event_data {
 	DAT_RMR_HANDLE rmr_handle;
 	DAT_RMR_COOKIE user_cookie;
 	DAT_RMR_BIND_COMPLETION_STATUS status;
-} DAT_RMR_BIND_COMPLETION_EVENT_DATA;
+};
 
 typedef union dat_sp_handle {
 	DAT_RSP_HANDLE rsp_handle;
@@ -905,7 +905,7 @@
 
 typedef union dat_event_data {
 	struct dat_dto_completion_event_data dto_completion_event_data;
-	DAT_RMR_BIND_COMPLETION_EVENT_DATA rmr_completion_event_data;
+	struct 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;
 	DAT_ASYNCH_ERROR_EVENT_DATA asynch_error_event_data;
diff -Nur -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/include/dapl_proto.h linux-kernel16/test/dapltest/include/dapl_proto.h
--- linux-kernel15/test/dapltest/include/dapl_proto.h	2005-05-09 13:16:08.366963000 -0700
+++ linux-kernel16/test/dapltest/include/dapl_proto.h	2005-05-09 13:20:14.136964000 -0700
@@ -393,7 +393,7 @@
 
 bool            DT_rmr_event_wait (DT_Tdep_Print_Head* phead, 
 				DAT_EVD_HANDLE evd_handle,
-				DAT_RMR_BIND_COMPLETION_EVENT_DATA *rmr_ptr);
+			struct dat_rmr_bind_completion_event_data *rmr_ptr);
 
 bool            DT_dto_check ( DT_Tdep_Print_Head* phead, 
 				  struct dat_dto_completion_event_data *dto_p,
@@ -403,7 +403,7 @@
 				  char            *message);
 
 bool            DT_rmr_check ( DT_Tdep_Print_Head* phead, 
-				  DAT_RMR_BIND_COMPLETION_EVENT_DATA*rmr_p,
+			      struct dat_rmr_bind_completion_event_data *rmr_p,
 				  DAT_RMR_HANDLE  rmr_expected,
 				  DAT_PVOID       cookie_expected,
 				  char            *message);
diff -Nur -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_bpool.c linux-kernel16/test/dapltest/test/dapl_bpool.c
--- linux-kernel15/test/dapltest/test/dapl_bpool.c	2005-05-09 11:34:28.741036000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_bpool.c	2005-05-09 13:19:10.558962000 -0700
@@ -210,7 +210,7 @@
     	struct dat_lmr_triplet iov;
     	DAT_RMR_COOKIE  cookie;
     	DAT_MEM_PRIV_FLAGS mflags;
-    	DAT_RMR_BIND_COMPLETION_EVENT_DATA rmr_stat;
+    	struct dat_rmr_bind_completion_event_data rmr_stat;
     
     	/* create the RMR */
     	ret = dat_rmr_create (pz_handle, &bpool_ptr->rmr_handle);
diff -Nur -X /home/tduffy/dontdiff linux-kernel15/test/dapltest/test/dapl_test_util.c linux-kernel16/test/dapltest/test/dapl_test_util.c
--- linux-kernel15/test/dapltest/test/dapl_test_util.c	2005-05-09 13:14:52.072963000 -0700
+++ linux-kernel16/test/dapltest/test/dapl_test_util.c	2005-05-09 13:19:10.563961000 -0700
@@ -529,7 +529,7 @@
 bool
 DT_rmr_event_wait (DT_Tdep_Print_Head *phead,
 		    DAT_EVD_HANDLE evd_handle,
-		    DAT_RMR_BIND_COMPLETION_EVENT_DATA *rmr_statusp)
+		    struct dat_rmr_bind_completion_event_data *rmr_statusp)
 {
     for (;;)
     {
@@ -619,7 +619,7 @@
  */
 bool
 DT_rmr_check ( DT_Tdep_Print_Head *phead,
-		DAT_RMR_BIND_COMPLETION_EVENT_DATA *rmr_p,
+		struct dat_rmr_bind_completion_event_data *rmr_p,
 		DAT_RMR_HANDLE  rmr_expected,
 		DAT_PVOID       cookie_expected,
 		char            *message)