[openib-general] [PATCH][6/19] kDAPL: Remove typedefs DAT_CONNECT_FLAGS & DAT_CLOSE_FLAGS
Tom Duffy
Tom.Duffy at Sun.COM
Sun May 15 11:27:16 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat/api.c linux-kernel6/dat/api.c
--- linux-kernel5/dat/api.c 2005-05-13 11:01:19.254000000 -0700
+++ linux-kernel6/dat/api.c 2005-05-13 13:48:10.193960000 -0700
@@ -625,7 +625,7 @@ EXPORT_SYMBOL(dat_ia_openv);
* Function: dat_ia_close
***********************************************************************/
-u32 dat_ia_close(DAT_IA_HANDLE ia_handle, DAT_CLOSE_FLAGS flags)
+u32 dat_ia_close(DAT_IA_HANDLE ia_handle, enum dat_close_flags flags)
{
struct dat_provider *provider;
struct dat_provider_attr provider_attr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat/dat.h linux-kernel6/dat/dat.h
--- linux-kernel5/dat/dat.h 2005-05-13 12:48:43.104001000 -0700
+++ linux-kernel6/dat/dat.h 2005-05-13 13:49:33.324968000 -0700
@@ -426,15 +426,15 @@ enum dat_qos {
* FLAGS
*/
-typedef enum dat_connect_flags {
+enum dat_connect_flags {
DAT_CONNECT_DEFAULT_FLAG = 0x00,
DAT_CONNECT_MULTIPATH_FLAG = 0x01
-} DAT_CONNECT_FLAGS;
+};
-typedef enum dat_close_flags {
+enum dat_close_flags {
DAT_CLOSE_ABRUPT_FLAG = 0x00,
DAT_CLOSE_GRACEFUL_FLAG = 0x01
-} DAT_CLOSE_FLAGS;
+};
#define DAT_CLOSE_DEFAULT DAT_CLOSE_ABRUPT_FLAG
@@ -1098,7 +1098,7 @@ typedef u32 (*DAT_IA_OPEN_FUNC)(const ch
typedef u32 (*DAT_IA_OPENV_FUNC)(const char *, int, DAT_EVD_HANDLE *,
DAT_IA_HANDLE *, u32, u32, boolean_t);
-typedef u32 (*DAT_IA_CLOSE_FUNC)(DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
+typedef u32 (*DAT_IA_CLOSE_FUNC)(DAT_IA_HANDLE, enum dat_close_flags);
typedef u32 (*DAT_IA_QUERY_FUNC)(DAT_IA_HANDLE, DAT_EVD_HANDLE *,
struct dat_ia_attr *,
@@ -1147,13 +1147,13 @@ typedef u32 (*DAT_EP_MODIFY_FUNC)(DAT_EP
typedef u32 (*DAT_EP_CONNECT_FUNC)(DAT_EP_HANDLE, struct sockaddr *,
DAT_CONN_QUAL, DAT_TIMEOUT, int,
const void *, enum dat_qos,
- DAT_CONNECT_FLAGS);
+ enum dat_connect_flags);
typedef u32 (*DAT_EP_DUP_CONNECT_FUNC)(DAT_EP_HANDLE, DAT_EP_HANDLE,
DAT_TIMEOUT, int, const void *,
enum dat_qos);
-typedef u32 (*DAT_EP_DISCONNECT_FUNC)(DAT_EP_HANDLE, DAT_CLOSE_FLAGS);
+typedef u32 (*DAT_EP_DISCONNECT_FUNC)(DAT_EP_HANDLE, enum dat_close_flags);
typedef u32 (*DAT_EP_POST_SEND_FUNC)(DAT_EP_HANDLE, int,
struct dat_lmr_triplet *, DAT_DTO_COOKIE,
@@ -1375,7 +1375,7 @@ extern u32 dat_ia_openv(const char *name
DAT_VERSION_MAJOR, DAT_VERSION_MINOR, \
DAT_THREADSAFE)
-extern u32 dat_ia_close(DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
+extern u32 dat_ia_close(DAT_IA_HANDLE, enum dat_close_flags);
extern u32 dat_strerror(u32, const char **, const char **);
@@ -1498,7 +1498,7 @@ static inline u32 dat_ep_connect(DAT_EP_
DAT_CONN_QUAL conn_qual, DAT_TIMEOUT timeout,
int private_data_size,
const void *private_data, enum dat_qos qos,
- DAT_CONNECT_FLAGS flags)
+ enum dat_connect_flags flags)
{
return DAT_CALL_PROVIDER_FUNC(ep_connect_func, ep, ia_addr, conn_qual,
timeout, private_data_size, private_data,
@@ -1528,7 +1528,8 @@ static inline u32 dat_ep_create_with_srq
out_evd, connect_evd, srq, attr, ep);
}
-static inline u32 dat_ep_disconnect(DAT_EP_HANDLE ep, DAT_CLOSE_FLAGS flags)
+static inline u32 dat_ep_disconnect(DAT_EP_HANDLE ep,
+ enum dat_close_flags flags)
{
return DAT_CALL_PROVIDER_FUNC(ep_disconnect_func, ep, flags);
}
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl_adapter_util.h linux-kernel6/dat-provider/dapl_adapter_util.h
--- linux-kernel5/dat-provider/dapl_adapter_util.h 2005-05-13 11:38:08.141004000 -0700
+++ linux-kernel6/dat-provider/dapl_adapter_util.h 2005-05-13 13:48:10.178969000 -0700
@@ -71,7 +71,7 @@ u32 dapl_ib_connect(DAT_EP_HANDLE ep_han
DAT_CONN_QUAL remote_conn_qual,
int private_data_size, void *private_data);
-u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, DAT_CLOSE_FLAGS close_flags);
+u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, enum dat_close_flags close_flags);
u32 dapl_ib_setup_conn_listener(DAPL_IA *ia_ptr, u64 ServiceID,
DAPL_SP *sp_ptr);
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl_ep_connect.c linux-kernel6/dat-provider/dapl_ep_connect.c
--- linux-kernel5/dat-provider/dapl_ep_connect.c 2005-05-13 12:33:26.934000000 -0700
+++ linux-kernel6/dat-provider/dapl_ep_connect.c 2005-05-13 13:47:43.558966000 -0700
@@ -46,7 +46,7 @@ u32 dapl_ep_connect(DAT_EP_HANDLE ep_han
struct sockaddr *remote_ia_address,
DAT_CONN_QUAL remote_conn_qual, DAT_TIMEOUT timeout,
int private_data_size, const void *private_data,
- enum dat_qos qos, DAT_CONNECT_FLAGS connect_flags)
+ enum dat_qos qos, enum dat_connect_flags connect_flags)
{
DAPL_EP *ep_ptr;
DAPL_EP alloc_ep;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl_ep_disconnect.c linux-kernel6/dat-provider/dapl_ep_disconnect.c
--- linux-kernel5/dat-provider/dapl_ep_disconnect.c 2005-05-12 09:28:48.679067000 -0700
+++ linux-kernel6/dat-provider/dapl_ep_disconnect.c 2005-05-13 13:48:10.181972000 -0700
@@ -64,7 +64,7 @@
* DAT_INVALID_PARAMETER
*/
u32 dapl_ep_disconnect(DAT_EP_HANDLE ep_handle,
- DAT_CLOSE_FLAGS disconnect_flags)
+ enum dat_close_flags disconnect_flags)
{
DAPL_EP *ep_ptr;
DAPL_EVD *evd_ptr;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl.h linux-kernel6/dat-provider/dapl.h
--- linux-kernel5/dat-provider/dapl.h 2005-05-13 12:48:23.531003000 -0700
+++ linux-kernel6/dat-provider/dapl.h 2005-05-13 13:48:10.174963000 -0700
@@ -478,7 +478,7 @@ extern u32 dapl_ia_open(const char *name
DAT_EVD_HANDLE *async_evd_handle_ptr,
DAT_IA_HANDLE *ia_handle_ptr);
-extern u32 dapl_ia_close(DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
+extern u32 dapl_ia_close(DAT_IA_HANDLE, enum dat_close_flags);
extern u32 dapl_ia_query(DAT_IA_HANDLE, DAT_EVD_HANDLE *, struct dat_ia_attr *,
struct dat_provider_attr *);
@@ -562,7 +562,7 @@ extern u32 dapl_ep_connect(DAT_EP_HANDLE
int private_data_size,
const void *private_data,
enum dat_qos quality_of_service,
- DAT_CONNECT_FLAGS connect_flags);
+ enum dat_connect_flags connect_flags);
extern u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep_handle,
DAT_EP_HANDLE ep_dup_handle, DAT_TIMEOUT timeout,
@@ -571,7 +571,7 @@ extern u32 dapl_ep_dup_connect(DAT_EP_HA
enum dat_qos quality_of_service);
extern u32 dapl_ep_disconnect(DAT_EP_HANDLE ep_handle,
- DAT_CLOSE_FLAGS close_flags);
+ enum dat_close_flags close_flags);
extern u32 dapl_ep_post_send(DAT_EP_HANDLE ep_handle, int num_segments,
struct dat_lmr_triplet *local_iov,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl_ia_close.c linux-kernel6/dat-provider/dapl_ia_close.c
--- linux-kernel5/dat-provider/dapl_ia_close.c 2005-05-12 09:28:48.154001000 -0700
+++ linux-kernel6/dat-provider/dapl_ia_close.c 2005-05-13 13:48:10.183967000 -0700
@@ -57,7 +57,7 @@
* DAT_INSUFFICIENT_RESOURCES
* DAT_INVALID_PARAMETER
*/
-u32 dapl_ia_close(DAT_IA_HANDLE ia_handle, DAT_CLOSE_FLAGS ia_flags)
+u32 dapl_ia_close(DAT_IA_HANDLE ia_handle, enum dat_close_flags ia_flags)
{
DAPL_IA *ia_ptr;
u32 dat_status;
diff -Nurp -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl_openib_cm.c linux-kernel6/dat-provider/dapl_openib_cm.c
--- linux-kernel5/dat-provider/dapl_openib_cm.c 2005-05-13 11:10:25.802007000 -0700
+++ linux-kernel6/dat-provider/dapl_openib_cm.c 2005-05-13 13:48:10.189990000 -0700
@@ -484,7 +484,7 @@ u32 dapl_ib_connect(DAT_EP_HANDLE ep_han
* DAT_INVALID_PARAMETER
*
*/
-u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, DAT_CLOSE_FLAGS close_flags)
+u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, enum dat_close_flags close_flags)
{
struct dapl_cm_id *conn = ep_ptr->cm_handle;
int status;
More information about the general
mailing list