[openib-general] [PATCH][14/19] kDAPL: Remove typedef DAT_DTO_COMPLETION_STATUS & #define DAT_RMR_BIND_COMPLETION_STATUS

[Tom Duffy]

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

diff -Nurp -X /home/tduffy/dontdiff linux-kernel13/dat/dat.h linux-kernel14/dat/dat.h
--- linux-kernel13/dat/dat.h	2005-05-13 14:37:53.695001000 -0700
+++ linux-kernel14/dat/dat.h	2005-05-13 14:50:25.254001000 -0700
@@ -732,7 +732,7 @@ struct dat_cr_param {
 /* Completion status flags */
 
 /* DTO completion status */
-typedef enum dat_dto_completion_status {
+enum dat_dto_completion_status {
 	DAT_DTO_SUCCESS = 0,
 	DAT_DTO_ERR_FLUSHED = 1,
 	DAT_DTO_ERR_LOCAL_LENGTH = 2,
@@ -745,7 +745,7 @@ typedef enum dat_dto_completion_status {
 	DAT_DTO_ERR_RECEIVER_NOT_READY = 9,
 	DAT_DTO_ERR_PARTIAL_PACKET = 10,
 	DAT_RMR_OPERATION_FAILED = 11
-} DAT_DTO_COMPLETION_STATUS;
+};
 
     /* RMR completion status */
 
@@ -754,7 +754,7 @@ typedef enum dat_dto_completion_status {
 #define DAT_RMR_BIND_FAILURE    DAT_DTO_ERR_FLUSHED
 
 /* RMR completion status */
-#define DAT_RMR_BIND_COMPLETION_STATUS DAT_DTO_COMPLETION_STATUS
+#define DAT_RMR_BIND_COMPLETION_STATUS enum dat_dto_completion_status
 
 /* Completion group structs (six total) */
 
@@ -763,7 +763,7 @@ typedef enum dat_dto_completion_status {
 struct dat_dto_completion_event_data {
 	DAT_EP_HANDLE ep_handle;
 	DAT_DTO_COOKIE user_cookie;
-	DAT_DTO_COMPLETION_STATUS status;
+	enum dat_dto_completion_status status;
 	u64 transfered_length;
 };
 
@@ -771,7 +771,7 @@ struct dat_dto_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;
+	enum dat_dto_completion_status status;
 };
 
 typedef union dat_sp_handle {
diff -Nurp -X /home/tduffy/dontdiff linux-kernel13/dat-provider/dapl_adapter_util.h linux-kernel14/dat-provider/dapl_adapter_util.h
--- linux-kernel13/dat-provider/dapl_adapter_util.h	2005-05-13 14:20:59.246005000 -0700
+++ linux-kernel14/dat-provider/dapl_adapter_util.h	2005-05-13 15:29:23.105005000 -0700
@@ -135,7 +135,8 @@ u32 dapl_ib_completion_poll(DAPL_HCA *hc
 
 u32 dapl_ib_completion_notify(DAPL_EVD *evd_ptr, ib_notification_type_t type);
 
-DAT_DTO_COMPLETION_STATUS dapl_ib_get_dto_status(ib_work_completion_t *cqe_ptr);
+enum dat_dto_completion_status dapl_ib_get_dto_status(ib_work_completion_t
+							*cqe_ptr);
 
 void dapl_ib_reinit_ep(DAPL_EP * ep_ptr);
 
diff -Nurp -X /home/tduffy/dontdiff linux-kernel13/dat-provider/dapl_evd_util.c linux-kernel14/dat-provider/dapl_evd_util.c
--- linux-kernel13/dat-provider/dapl_evd_util.c	2005-05-13 13:52:08.757991000 -0700
+++ linux-kernel14/dat-provider/dapl_evd_util.c	2005-05-13 14:47:24.445001000 -0700
@@ -628,7 +628,7 @@ dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr
 {
 	DAPL_EP *ep_ptr;
 	DAPL_COOKIE *cookie;
-	DAT_DTO_COMPLETION_STATUS dto_status;
+	enum dat_dto_completion_status dto_status;
 
 	/*
 	 * All that can be relied on if the status is bad is the status
diff -Nurp -X /home/tduffy/dontdiff linux-kernel13/dat-provider/dapl_openib_util.c linux-kernel14/dat-provider/dapl_openib_util.c
--- linux-kernel13/dat-provider/dapl_openib_util.c	2005-05-13 14:26:12.927003000 -0700
+++ linux-kernel14/dat-provider/dapl_openib_util.c	2005-05-13 15:29:49.548012000 -0700
@@ -57,7 +57,7 @@ u32 dapl_ib_get_hca_ids(ib_hca_handle_t 
  */
 static struct ib_status_map {
 	int ib_status;
-	DAT_DTO_COMPLETION_STATUS dat_status;
+	enum dat_dto_completion_status dat_status;
 } ib_status_map[] = {
 	/* 0  */  {
 	IB_WC_SUCCESS, DAT_DTO_SUCCESS},
@@ -813,7 +813,8 @@ u32 dapl_ib_completion_notify(DAPL_EVD *
  *	Value from ib_status_map table above
  */
 
-DAT_DTO_COMPLETION_STATUS dapl_ib_get_dto_status(ib_work_completion_t * cqe_ptr)
+enum dat_dto_completion_status dapl_ib_get_dto_status(ib_work_completion_t 
+							*cqe_ptr)
 {
 	u32 ib_status;
 	int i;