[openib-general] [PATCH][12/19] kDAPL: Remove typedef DAT_EP_PARAM_MASK

[Tom Duffy]

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

diff -Nurp -X /home/tduffy/dontdiff linux-kernel11/dat/dat.h linux-kernel12/dat/dat.h
--- linux-kernel11/dat/dat.h	2005-05-13 14:32:57.034000000 -0700
+++ linux-kernel12/dat/dat.h	2005-05-13 14:35:17.136006000 -0700
@@ -610,7 +610,7 @@ struct dat_ep_param {
 	struct dat_ep_attr ep_attr;
 };
 
-typedef enum dat_ep_param_mask {
+enum dat_ep_param_mask {
         DAT_EP_FIELD_IA_HANDLE                           = (1 << 0),
         DAT_EP_FIELD_EP_STATE                            = (1 << 1),
         DAT_EP_FIELD_LOCAL_IA_ADDRESS_PTR                = (1 << 2),
@@ -642,7 +642,7 @@ typedef enum dat_ep_param_mask {
         DAT_EP_FIELD_EP_ATTR_PROVIDER_SPECIFIC_ATTR      = (1 << 28),
         DAT_EP_FIELD_EP_ATTR_ALL                         = 0x3FFFF000,
         DAT_EP_FIELD_ALL                                 = 0x3FFFF7FF
-} DAT_EP_PARAM_MASK;
+};
 
 #define DAT_WATERMARK_INFINITE                           ((int)~0)
 #define DAT_HW_DEFAULT                                   DAT_WATERMARK_INFINITE
@@ -1141,7 +1141,7 @@ typedef u32 (*DAT_EP_CREATE_WITH_SRQ_FUN
 
 typedef u32 (*DAT_EP_QUERY_FUNC)(DAT_EP_HANDLE, struct dat_ep_param *);
 
-typedef u32 (*DAT_EP_MODIFY_FUNC)(DAT_EP_HANDLE, DAT_EP_PARAM_MASK,
+typedef u32 (*DAT_EP_MODIFY_FUNC)(DAT_EP_HANDLE, enum dat_ep_param_mask,
 				  const struct dat_ep_param *);
 
 typedef u32 (*DAT_EP_CONNECT_FUNC)(DAT_EP_HANDLE, struct sockaddr *,
@@ -1556,7 +1556,7 @@ static inline u32 dat_ep_get_status(DAT_
 				      req_idle);
 }
 
-static inline u32 dat_ep_modify(DAT_EP_HANDLE ep, DAT_EP_PARAM_MASK mask,
+static inline u32 dat_ep_modify(DAT_EP_HANDLE ep, enum dat_ep_param_mask mask,
 				const struct dat_ep_param *param)
 {
         return DAT_CALL_PROVIDER_FUNC(ep_modify_func, ep, mask, param);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel11/dat-provider/dapl_ep_modify.c linux-kernel12/dat-provider/dapl_ep_modify.c
--- linux-kernel11/dat-provider/dapl_ep_modify.c	2005-05-12 09:28:47.996001000 -0700
+++ linux-kernel12/dat-provider/dapl_ep_modify.c	2005-05-13 14:35:01.164000000 -0700
@@ -54,7 +54,7 @@
 
 static inline u32
 dapl_ep_modify_validate_parameters(DAT_EP_HANDLE ep_handle,
-				   DAT_EP_PARAM_MASK mask,
+				   enum dat_ep_param_mask mask,
 				   const struct dat_ep_param *ep_param,
 				   DAPL_IA ** ia_ptr,
 				   DAPL_EP ** ep_ptr,
@@ -308,7 +308,7 @@ dapl_ep_modify_validate_parameters(DAT_E
  *	DAT_INVALID_ATTRIBUTE
  *	DAT_INVALID_STATE
  */
-u32 dapl_ep_modify(DAT_EP_HANDLE ep_handle, DAT_EP_PARAM_MASK mask,
+u32 dapl_ep_modify(DAT_EP_HANDLE ep_handle, enum dat_ep_param_mask mask,
 		   const struct dat_ep_param *ep_param)
 {
 	DAPL_IA *ia;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel11/dat-provider/dapl.h linux-kernel12/dat-provider/dapl.h
--- linux-kernel11/dat-provider/dapl.h	2005-05-13 14:33:34.971016000 -0700
+++ linux-kernel12/dat-provider/dapl.h	2005-05-13 14:35:01.158008000 -0700
@@ -553,7 +553,7 @@ extern u32 dapl_ep_create(DAT_IA_HANDLE 
 extern u32 dapl_ep_query(DAT_EP_HANDLE, struct dat_ep_param *);
 
 extern u32 dapl_ep_modify(DAT_EP_HANDLE ep_handle,
-			  DAT_EP_PARAM_MASK ep_args_mask,
+			  enum dat_ep_param_mask ep_args_mask,
 			  const struct dat_ep_param *ep_args);
 
 extern u32 dapl_ep_connect(DAT_EP_HANDLE ep_handle,