[openib-general] [PATCH][21/26] kDAPL: Remove typedef DAT_EVENT

Tom Duffy Tom.Duffy at Sun.COM
Mon May 9 14:39:44 PDT 2005


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

diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat/dat.h linux-kernel21/dat/dat.h
--- linux-kernel20/dat/dat.h	2005-05-09 13:29:50.153961000 -0700
+++ linux-kernel21/dat/dat.h	2005-05-09 13:32:35.923960000 -0700
@@ -914,11 +914,11 @@
 
 /* Event struct that holds all event information */
 
-typedef struct dat_event {
+struct dat_event {
 	DAT_EVENT_NUMBER event_number;
 	DAT_EVD_HANDLE evd_handle;
 	DAT_EVENT_DATA event_data;
-} DAT_EVENT;
+};
 
 /* Upcall support */
 
@@ -931,7 +931,8 @@
 	                                /* UpCalls return               */
 } DAT_UPCALL_POLICY;
 
-typedef void (*DAT_UPCALL_FUNC) (DAT_PVOID, const DAT_EVENT *, DAT_BOOLEAN);
+typedef void (*DAT_UPCALL_FUNC) (DAT_PVOID, const struct dat_event *,
+				 DAT_BOOLEAN);
 
 typedef struct dat_upcall_object {
 	DAT_PVOID instance_data;
@@ -1136,9 +1137,10 @@
 
 typedef DAT_RETURN (*DAT_EVD_RESIZE_FUNC) (DAT_EVD_HANDLE, DAT_COUNT);
 
-typedef DAT_RETURN (*DAT_EVD_POST_SE_FUNC) (DAT_EVD_HANDLE, const DAT_EVENT *);
+typedef DAT_RETURN (*DAT_EVD_POST_SE_FUNC) (DAT_EVD_HANDLE,
+					    const struct dat_event *);
 
-typedef DAT_RETURN (*DAT_EVD_DEQUEUE_FUNC) (DAT_EVD_HANDLE, DAT_EVENT *);
+typedef DAT_RETURN (*DAT_EVD_DEQUEUE_FUNC) (DAT_EVD_HANDLE, struct dat_event *);
 
 typedef DAT_RETURN (*DAT_EVD_FREE_FUNC) (DAT_EVD_HANDLE);
 
@@ -1468,7 +1470,7 @@
 }
 
 static inline DAT_RETURN dat_evd_dequeue(DAT_EVD_HANDLE evd, 
-                                         DAT_EVENT * event)
+                                         struct dat_event *event)
 {
         return DAT_CALL_PROVIDER_FUNC(evd_dequeue_func, evd, event);
 }
@@ -1498,7 +1500,7 @@
 }
 
 static inline DAT_RETURN dat_evd_post_se(DAT_EVD_HANDLE evd, 
-                                         const DAT_EVENT * event)
+                                         const struct dat_event *event)
 {
         return DAT_CALL_PROVIDER_FUNC(evd_post_se_func, evd, event);
 }
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat-provider/dapl_cno_util.c linux-kernel21/dat-provider/dapl_cno_util.c
--- linux-kernel20/dat-provider/dapl_cno_util.c	2005-05-04 13:38:41.244002000 -0700
+++ linux-kernel21/dat-provider/dapl_cno_util.c	2005-05-09 13:39:21.136968000 -0700
@@ -114,7 +114,7 @@
     DAPL_EVD		*evd_ptr)
 {
     DAT_RETURN		dat_status;
-    DAT_EVENT		event;
+    struct dat_event event;
 
     dat_status = DAT_SUCCESS;
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat-provider/dapl_evd_dequeue.c linux-kernel21/dat-provider/dapl_evd_dequeue.c
--- linux-kernel20/dat-provider/dapl_evd_dequeue.c	2005-04-20 12:42:07.511003000 -0700
+++ linux-kernel21/dat-provider/dapl_evd_dequeue.c	2005-05-09 13:33:41.965966000 -0700
@@ -62,10 +62,10 @@
  * 	DAT_QUEUE_EMPTY
  */
 
-DAT_RETURN dapl_evd_dequeue(DAT_EVD_HANDLE evd_handle, DAT_EVENT * event)
+DAT_RETURN dapl_evd_dequeue(DAT_EVD_HANDLE evd_handle, struct dat_event *event)
 {
 	DAPL_EVD *evd_ptr;
-	DAT_EVENT *local_event;
+	struct dat_event *local_event;
 	DAT_RETURN dat_status;
 
 	dapl_dbg_log(DAPL_DBG_TYPE_API,
@@ -108,7 +108,7 @@
 	 * from CQ to EVD.  
 	 */
 	local_event =
-	    (DAT_EVENT *) dapl_rbuf_remove(&evd_ptr->pending_event_queue);
+	    (struct dat_event *)dapl_rbuf_remove(&evd_ptr->pending_event_queue);
 	if (local_event != NULL) {
 		*event = *local_event;
 		dat_status = dapl_rbuf_add(&evd_ptr->free_event_queue,
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat-provider/dapl_evd_post_se.c linux-kernel21/dat-provider/dapl_evd_post_se.c
--- linux-kernel20/dat-provider/dapl_evd_post_se.c	2005-04-20 12:42:07.215014000 -0700
+++ linux-kernel21/dat-provider/dapl_evd_post_se.c	2005-05-09 13:34:05.073960000 -0700
@@ -59,7 +59,8 @@
  * 	DAT_INVALID_PARAMETER
  */
 
-DAT_RETURN dapl_evd_post_se(DAT_EVD_HANDLE evd_handle, const DAT_EVENT * event)
+DAT_RETURN dapl_evd_post_se(DAT_EVD_HANDLE evd_handle,
+			    const struct dat_event *event)
 {
 	DAPL_EVD *evd_ptr;
 	DAT_RETURN dat_status;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat-provider/dapl_evd_util.c linux-kernel21/dat-provider/dapl_evd_util.c
--- linux-kernel20/dat-provider/dapl_evd_util.c	2005-05-09 11:07:02.062017000 -0700
+++ linux-kernel21/dat-provider/dapl_evd_util.c	2005-05-09 13:41:09.036964000 -0700
@@ -176,7 +176,7 @@
  */
 DAT_RETURN dapl_evd_event_alloc(DAPL_EVD * evd_ptr, DAT_COUNT qlen)
 {
-	DAT_EVENT *event_ptr;
+	struct dat_event *event_ptr;
 	DAT_COUNT i;
 	DAT_RETURN dat_status;
 
@@ -184,7 +184,8 @@
 
 	/* Allocate EVENTs */
 	event_ptr =
-	    (DAT_EVENT *) kmalloc(evd_ptr->qlen * sizeof(DAT_EVENT), GFP_ATOMIC);
+	    (struct dat_event *)kmalloc(evd_ptr->qlen * sizeof *event_ptr,
+					GFP_ATOMIC);
 	if (event_ptr == NULL) {
 		dat_status =
 		    DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
@@ -219,15 +220,15 @@
  */
 DAT_RETURN dapl_evd_event_realloc(DAPL_EVD * evd_ptr, DAT_COUNT qlen)
 {
-    DAT_EVENT	*events;
+    struct dat_event *events;
     DAT_COUNT	old_qlen;
     DAT_COUNT   i;
     intptr_t	diff;
     DAT_RETURN	dat_status;
 
     /* Allocate EVENTs */
-    events = (DAT_EVENT *) dapl_os_realloc(evd_ptr->events,
-                                           qlen * sizeof (DAT_EVENT));
+    events = (struct dat_event *)dapl_os_realloc(evd_ptr->events,
+						 qlen * sizeof *events);
     if ( NULL == events )
     {
 	dat_status = DAT_ERROR(DAT_INSUFFICIENT_RESOURCES, DAT_RESOURCE_MEMORY);
@@ -392,15 +393,15 @@
  * that the lock is held.
  */
 
-static DAT_EVENT *dapl_evd_get_event(DAPL_EVD * evd_ptr)
+static struct dat_event *dapl_evd_get_event(DAPL_EVD * evd_ptr)
 {
-	DAT_EVENT *event;
+	struct dat_event *event;
 
 	if (evd_ptr->evd_producer_locking_needed) {
 		spin_lock(&evd_ptr->header.lock);
 	}
 
-	event = (DAT_EVENT *) dapl_rbuf_remove(&evd_ptr->free_event_queue);
+	event = (struct dat_event *) dapl_rbuf_remove(&evd_ptr->free_event_queue);
 
 	/* Release the lock if it was taken and the call failed.  */
 	if (!event && evd_ptr->evd_producer_locking_needed) {
@@ -418,7 +419,7 @@
  * entry to this function.
  */
 
-static void dapl_evd_post_event(DAPL_EVD * evd_ptr, const DAT_EVENT * event_ptr)
+static void dapl_evd_post_event(DAPL_EVD * evd_ptr, const struct dat_event * event_ptr)
 {
 	DAT_RETURN dat_status;
 	DAPL_CNO * cno_to_trigger = NULL;
@@ -450,7 +451,7 @@
  * format an overflow event for posting
  */
 static void
-dapl_evd_format_overflow_event(DAPL_EVD * evd_ptr, DAT_EVENT * event_ptr)
+dapl_evd_format_overflow_event(DAPL_EVD * evd_ptr, struct dat_event * event_ptr)
 {
 	DAPL_IA *ia_ptr;
 
@@ -469,7 +470,7 @@
 dapl_evd_post_overflow_event(DAPL_EVD * async_evd_ptr,
 			     DAPL_EVD * overflow_evd_ptr)
 {
-	DAT_EVENT *overflow_event;
+	struct dat_event *overflow_event;
 
 	/* The overflow_evd_ptr mght be the same as evd.
 	 * In that case we've got a catastrophic overflow.
@@ -493,10 +494,10 @@
 	return;
 }
 
-static DAT_EVENT *dapl_evd_get_and_init_event(DAPL_EVD * evd_ptr,
+static struct dat_event *dapl_evd_get_and_init_event(DAPL_EVD * evd_ptr,
 					      DAT_EVENT_NUMBER event_number)
 {
-	DAT_EVENT *event_ptr;
+	struct dat_event *event_ptr;
 
 	event_ptr = dapl_evd_get_event(evd_ptr);
 	if (NULL == event_ptr) {
@@ -517,7 +518,7 @@
 			       DAT_IA_ADDRESS_PTR ia_address_ptr,
 			       DAT_CONN_QUAL conn_qual, DAT_CR_HANDLE cr_handle)
 {
-	DAT_EVENT *event_ptr;
+	struct dat_event *event_ptr;
 	event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
 	/*
 	 * Note event lock may be held on successful return
@@ -548,7 +549,7 @@
 			       DAT_COUNT private_data_size,
 			       DAT_PVOID private_data)
 {
-	DAT_EVENT *event_ptr;
+	struct dat_event *event_ptr;
 	event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
 	/*
 	 * Note event lock may be held on successful return
@@ -576,7 +577,7 @@
 				DAT_EVENT_NUMBER event_number,
 				DAT_IA_HANDLE ia_handle)
 {
-	DAT_EVENT *event_ptr;
+	struct dat_event *event_ptr;
 	event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
 	/*
 	 * Note event lock may be held on successful return
@@ -601,7 +602,7 @@
 dapl_evd_post_software_event(DAPL_EVD * evd_ptr,
 			     DAT_EVENT_NUMBER event_number, DAT_PVOID pointer)
 {
-	DAT_EVENT *event_ptr;
+	struct dat_event *event_ptr;
 	event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
 	/*
 	 * Note event lock may be held on successful return
@@ -638,7 +639,8 @@
  *
  */
 static void
-dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr, void *cqe_ptr, DAT_EVENT * event_ptr)
+dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr, void *cqe_ptr,
+		      struct dat_event *event_ptr)
 {
 	DAPL_EP *ep_ptr;
 	DAPL_COOKIE *cookie;
@@ -773,7 +775,8 @@
  * 	Status of operation
  *
  */
-DAT_RETURN dapl_evd_cq_poll_to_event(DAPL_EVD * evd_ptr, DAT_EVENT * event)
+DAT_RETURN dapl_evd_cq_poll_to_event(DAPL_EVD * evd_ptr,
+				     struct dat_event *event)
 {
 	DAT_RETURN dat_status;
 	ib_work_completion_t cur_cqe;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat-provider/dapl_evd_util.h linux-kernel21/dat-provider/dapl_evd_util.h
--- linux-kernel20/dat-provider/dapl_evd_util.h	2005-05-09 11:07:02.080018000 -0700
+++ linux-kernel21/dat-provider/dapl_evd_util.h	2005-05-09 13:36:32.543960000 -0700
@@ -112,6 +112,6 @@
 					     void *context);
 
 extern DAT_RETURN dapl_evd_cq_poll_to_event(DAPL_EVD * evd_ptr,
-					    DAT_EVENT * event);
+					    struct dat_event *event);
 
 #endif
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/dat-provider/dapl.h linux-kernel21/dat-provider/dapl.h
--- linux-kernel20/dat-provider/dapl.h	2005-05-09 12:57:28.613033000 -0700
+++ linux-kernel21/dat-provider/dapl.h	2005-05-09 13:37:15.817963000 -0700
@@ -177,7 +177,8 @@
 
 typedef void (*DAPL_CONNECTION_STATE_HANDLER) (DAPL_EP *,
 					       ib_cm_events_t,
-					       const void *, DAT_EVENT *);
+					       const void *,
+					       struct dat_event *);
 
 /*********************************************************************
  *                                                                   *
@@ -284,7 +285,7 @@
 
     /* the actual events */
     DAT_COUNT           qlen;
-    DAT_EVENT           *events;
+    struct dat_event   *events;
     DAPL_RING_BUFFER    free_event_queue;
     DAPL_RING_BUFFER    pending_event_queue;
     DAPL_CNO            *cno_ptr;
@@ -543,10 +544,10 @@
 				  DAT_COUNT);	/* evd_qlen */
 
 extern DAT_RETURN dapl_evd_post_se(DAT_EVD_HANDLE,	/* evd_handle */
-				   const DAT_EVENT *);	/* event */
+				   const struct dat_event *);	/* event */
 
 extern DAT_RETURN dapl_evd_dequeue(DAT_EVD_HANDLE,	/* evd_handle */
-				   DAT_EVENT *);	/* event */
+				   struct dat_event *);	/* event */
 
 extern DAT_RETURN dapl_evd_free(DAT_EVD_HANDLE);
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/include/dapl_fft_util.h linux-kernel21/test/dapltest/include/dapl_fft_util.h
--- linux-kernel20/test/dapltest/include/dapl_fft_util.h	2005-05-09 13:23:19.226964000 -0700
+++ linux-kernel21/test/dapltest/include/dapl_fft_util.h	2005-05-09 13:31:50.574963000 -0700
@@ -60,7 +60,7 @@
     DAT_PSP_HANDLE psp_handle;
     DAT_EP_HANDLE ep_handle;
     DAT_EVD_HANDLE cr_evd, conn_evd, send_evd, recv_evd;
-    DAT_EVENT event;
+    struct dat_event event;
     DAT_COUNT count;
     DAT_CR_HANDLE cr_handle;
     Bpool *bpool;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/include/dapl_tdep.h linux-kernel21/test/dapltest/include/dapl_tdep.h
--- linux-kernel20/test/dapltest/include/dapl_tdep.h	2005-05-05 09:42:06.664001000 -0700
+++ linux-kernel21/test/dapltest/include/dapl_tdep.h	2005-05-09 13:42:35.094961000 -0700
@@ -57,9 +57,9 @@
 DAT_RETURN
 DT_Tdep_evd_wait (DAT_EVD_HANDLE 	evd_handle,
 		  DAT_TIMEOUT   	timeout,
-		  DAT_EVENT      	*event);
+		  struct dat_event    	*event);
 DAT_RETURN
 DT_Tdep_evd_dequeue (DAT_EVD_HANDLE	evd_handle,
-		     DAT_EVENT		*event);
+		     struct dat_event	*event);
 
 #endif
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/kdapl/kdapl_tdep_evd.c linux-kernel21/test/dapltest/kdapl/kdapl_tdep_evd.c
--- linux-kernel20/test/dapltest/kdapl/kdapl_tdep_evd.c	2005-05-05 13:35:54.888008000 -0700
+++ linux-kernel21/test/dapltest/kdapl/kdapl_tdep_evd.c	2005-05-09 13:38:10.908963000 -0700
@@ -30,7 +30,7 @@
 
 typedef struct Tdep_Event_Tag
 {
-    DAT_EVENT		   dat_event;
+    struct dat_event dat_event;
     struct Tdep_Event_Tag *event_next;
 } Tdep_Event;
 
@@ -46,7 +46,7 @@
 /* static function prototypes */
 static void DT_Tdep_Event_Callback (
 	DAT_PVOID		instance_data,
-	const DAT_EVENT *	dat_event,
+	const struct dat_event *dat_event,
 	DAT_BOOLEAN		bool_arg);
 
 /* static data */
@@ -156,7 +156,7 @@
 }
 DAT_RETURN
 DT_Tdep_evd_dequeue (DAT_EVD_HANDLE evd_handle,
-		     DAT_EVENT      *dat_event)
+		     struct dat_event *dat_event)
 {
     DAT_RETURN dat_status;
     Tdep_Evd   *evd_ptr;    
@@ -215,7 +215,7 @@
 DAT_RETURN
 DT_Tdep_evd_wait (DAT_EVD_HANDLE evd_handle,
 		  DAT_TIMEOUT   timeout,
-		  DAT_EVENT      *dat_event)
+		  struct dat_event      *dat_event)
 {
     DAT_RETURN  dat_status;
     Tdep_Evd	*evd_ptr;
@@ -323,7 +323,7 @@
 
 static void DT_Tdep_Event_Callback (
 	DAT_PVOID		instance_data,
-	const DAT_EVENT *	dat_event,
+	const struct dat_event *	dat_event,
 	DAT_BOOLEAN		bool_arg)
 {
     Tdep_Event	*event;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_client.c linux-kernel21/test/dapltest/test/dapl_client.c
--- linux-kernel20/test/dapltest/test/dapl_client.c	2005-05-09 13:14:52.046961000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_client.c	2005-05-09 13:31:50.593960000 -0700
@@ -275,7 +275,7 @@
     {
 	if ( event_num == DAT_CONNECTION_EVENT_PEER_REJECTED )
 	{
-	    DAT_EVENT       event;
+	    struct dat_event       event;
 	    DAT_COUNT	    drained = 0;
 
 	    DT_Mdep_Sleep (1000);
@@ -549,7 +549,7 @@
     /* Free the EP */
     if (ep_handle)
     {
-	DAT_EVENT       		event;
+	struct dat_event       		event;
 	/*
 	 * Drain off outstanding DTOs that may have been
 	 * generated by racing disconnects
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_fft_endpoint.c linux-kernel21/test/dapltest/test/dapl_fft_endpoint.c
--- linux-kernel20/test/dapltest/test/dapl_fft_endpoint.c	2005-05-04 09:45:07.529005000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_fft_endpoint.c	2005-05-09 13:31:50.597962000 -0700
@@ -168,7 +168,7 @@
     DAT_EP_HANDLE ep_handle;
     DAT_EVD_HANDLE send_evd, conn_evd, recv_evd, cr_evd;
     DAT_PZ_HANDLE pz_handle;
-    DAT_EVENT event;
+    struct dat_event event;
     Bpool *bpool;
     int res;
     DAT_RETURN rc;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_limit.c linux-kernel21/test/dapltest/test/dapl_limit.c
--- linux-kernel20/test/dapltest/test/dapl_limit.c	2005-05-09 12:16:33.897001000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_limit.c	2005-05-09 13:31:50.606962000 -0700
@@ -1084,7 +1084,7 @@
 	    /* Rpost Cleanup loop */
 	    for (i = 0;  i < cmd->width;  i++)
 	    {
-		DAT_EVENT       		event;
+		struct dat_event       		event;
 
 		/*
 		 * Disconnecting an unconnected EP should complete
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_performance_client.c linux-kernel21/test/dapltest/test/dapl_performance_client.c
--- linux-kernel20/test/dapltest/test/dapl_performance_client.c	2005-05-09 13:16:26.034961000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_performance_client.c	2005-05-09 13:31:50.611964000 -0700
@@ -255,7 +255,7 @@
     struct dat_lmr_triplet	*iov;
     struct dat_rmr_triplet     	rmr_triplet;
     DAT_DTO_COOKIE 		cookie;
-    DAT_EVENT       		event;
+    struct dat_event       		event;
     DAT_RETURN      		ret;
     Performance_Ep_Context_t 	*ep_context;
     Performance_Test_Op_t   	*op;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_performance_util.c linux-kernel21/test/dapltest/test/dapl_performance_util.c
--- linux-kernel20/test/dapltest/test/dapl_performance_util.c	2005-05-09 11:52:38.934000000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_performance_util.c	2005-05-09 13:31:50.617962000 -0700
@@ -526,7 +526,7 @@
     DAT_COUNT			i;
     DAT_COUNT			queue_size;
     DAT_RETURN      		ret;
-    DAT_EVENT       		event;
+    struct dat_event       		event;
     unsigned long 		pre_ctxt_num;
     unsigned long 		post_ctxt_num;
     DT_Mdep_TimeStamp 		pre_ts;
@@ -615,7 +615,7 @@
     Performance_Stats_t 		*stats)
 {
     DAT_RETURN      		ret;
-    DAT_EVENT       		event;
+    struct dat_event       		event;
     unsigned long 		pre_ctxt_num;
     unsigned long 		post_ctxt_num;
     DT_Mdep_TimeStamp 		pre_ts;
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_test_util.c linux-kernel21/test/dapltest/test/dapl_test_util.c
--- linux-kernel20/test/dapltest/test/dapl_test_util.c	2005-05-09 13:25:54.690963000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_test_util.c	2005-05-09 13:31:50.623960000 -0700
@@ -259,7 +259,7 @@
     for (;;)
     {
 	DAT_RETURN      ret;
-	DAT_EVENT       event;
+	struct dat_event       event;
 
 	ret = DT_Tdep_evd_wait (evd_handle, DAT_TIMEOUT_INFINITE, &event);
 	if (ret != DAT_SUCCESS)
@@ -314,7 +314,7 @@
     for (;;)
     {
 	DAT_RETURN      ret;
-	DAT_EVENT       event;
+	struct dat_event       event;
 
 	ret = DT_Tdep_evd_wait (evd_handle, DAT_TIMEOUT_INFINITE, &event);
 	if (ret != DAT_SUCCESS)
@@ -367,7 +367,7 @@
     for (;;)
     {
 	DAT_RETURN      ret;
-	DAT_EVENT       event;
+	struct dat_event       event;
 
 	ret = DT_Tdep_evd_wait (evd_handle, DAT_TIMEOUT_INFINITE, &event);
 	if (ret != DAT_SUCCESS)
@@ -438,7 +438,7 @@
     for (;;)
     {
 	DAT_RETURN      ret;
-	DAT_EVENT       event;
+	struct dat_event       event;
 
 	ret = DT_Tdep_evd_dequeue ( evd_handle,
 			       &event);
@@ -490,7 +490,7 @@
     for (;;)
     {
 	DAT_RETURN      ret;
-	DAT_EVENT       event;
+	struct dat_event       event;
 
 	ret = DT_Tdep_evd_wait (evd_handle, DAT_TIMEOUT_INFINITE, &event);
 	if (ret != DAT_SUCCESS)
@@ -534,7 +534,7 @@
     for (;;)
     {
 	DAT_RETURN      ret;
-	DAT_EVENT       event;
+	struct dat_event       event;
 
 	ret = DT_Tdep_evd_wait (evd_handle, DAT_TIMEOUT_INFINITE, &event);
 	if (ret != DAT_SUCCESS)
diff -Nur -X /home/tduffy/dontdiff linux-kernel20/test/dapltest/test/dapl_transaction_test.c linux-kernel21/test/dapltest/test/dapl_transaction_test.c
--- linux-kernel20/test/dapltest/test/dapl_transaction_test.c	2005-05-09 13:23:19.269962000 -0700
+++ linux-kernel21/test/dapltest/test/dapl_transaction_test.c	2005-05-09 13:31:50.633961000 -0700
@@ -741,7 +741,7 @@
 		     * the REJECT; clean them up and repost if so
 		     */
 		    {
-			DAT_EVENT       event;
+			struct dat_event       event;
 			DAT_COUNT	drained = 0;
 
 			dat_ep_reset (test_ptr->ep_context[i].ep_handle);
@@ -1186,7 +1186,7 @@
 	     */
 	    if ( DAT_HANDLE_NULL != ep_handle)
 	    {
-		DAT_EVENT       		event;
+		struct dat_event       		event;
 		/*
 		 * Drain off outstanding DTOs that may have been
 		 * generated by racing disconnects




More information about the general mailing list