[openib-general] [PATCH][8/26] kDAPL: Remove typedef DAT_EP_PARAM
Tom Duffy
Tom.Duffy at Sun.COM
Mon May 9 14:39:41 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/dat/dat.h linux-kernel8/dat/dat.h
--- linux-kernel7/dat/dat.h 2005-05-09 12:17:29.401004000 -0700
+++ linux-kernel8/dat/dat.h 2005-05-09 12:30:15.364000000 -0700
@@ -610,7 +610,7 @@
DAT_EP_STATE_COMPLETION_PENDING
} DAT_EP_STATE;
-typedef struct dat_ep_param {
+struct dat_ep_param {
DAT_IA_HANDLE ia_handle;
DAT_EP_STATE ep_state;
DAT_IA_ADDRESS_PTR local_ia_address_ptr;
@@ -623,7 +623,7 @@
DAT_EVD_HANDLE connect_evd_handle;
DAT_SRQ_HANDLE srq_handle;
struct dat_ep_attr ep_attr;
-} DAT_EP_PARAM;
+};
typedef enum dat_ep_param_mask {
DAT_EP_FIELD_IA_HANDLE = (1 << 0),
@@ -1152,10 +1152,10 @@
DAT_IA_HANDLE, DAT_PZ_HANDLE, DAT_EVD_HANDLE, DAT_EVD_HANDLE,
DAT_EVD_HANDLE, DAT_SRQ_HANDLE, const struct dat_ep_attr *, DAT_EP_HANDLE *);
-typedef DAT_RETURN (*DAT_EP_QUERY_FUNC) (DAT_EP_HANDLE, DAT_EP_PARAM *);
+typedef DAT_RETURN (*DAT_EP_QUERY_FUNC) (DAT_EP_HANDLE, struct dat_ep_param *);
typedef DAT_RETURN (*DAT_EP_MODIFY_FUNC) (
- DAT_EP_HANDLE, DAT_EP_PARAM_MASK, const DAT_EP_PARAM *);
+ DAT_EP_HANDLE, DAT_EP_PARAM_MASK, const struct dat_ep_param *);
typedef DAT_RETURN (*DAT_EP_CONNECT_FUNC) (
DAT_EP_HANDLE, DAT_IA_ADDRESS_PTR, DAT_CONN_QUAL, DAT_TIMEOUT, DAT_COUNT,
@@ -1584,7 +1584,7 @@
static inline DAT_RETURN dat_ep_modify(DAT_EP_HANDLE ep,
DAT_EP_PARAM_MASK mask,
- const DAT_EP_PARAM * param)
+ const struct dat_ep_param *param)
{
return DAT_CALL_PROVIDER_FUNC(ep_modify_func, ep, mask, param);
}
@@ -1631,7 +1631,7 @@
ep_post_send_func, ep, size, local_iov, cookie, flags);
}
-static inline DAT_RETURN dat_ep_query(DAT_EP_HANDLE ep, DAT_EP_PARAM * param)
+static inline DAT_RETURN dat_ep_query(DAT_EP_HANDLE ep, struct dat_ep_param *param)
{
return DAT_CALL_PROVIDER_FUNC(ep_query_func, ep, param);
}
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl_ep_free.c linux-kernel8/dat-provider/dapl_ep_free.c
--- linux-kernel7/dat-provider/dapl_ep_free.c 2005-04-27 11:38:35.113023000 -0700
+++ linux-kernel8/dat-provider/dapl_ep_free.c 2005-05-09 12:29:25.407003000 -0700
@@ -65,7 +65,7 @@
{
DAPL_EP *ep_ptr;
DAPL_IA *ia_ptr;
- DAT_EP_PARAM *param;
+ struct dat_ep_param *param;
ib_qp_state_t save_qp_state;
DAT_RETURN dat_status = DAT_SUCCESS;
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl_ep_modify.c linux-kernel8/dat-provider/dapl_ep_modify.c
--- linux-kernel7/dat-provider/dapl_ep_modify.c 2005-05-09 12:20:20.503018000 -0700
+++ linux-kernel8/dat-provider/dapl_ep_modify.c 2005-05-09 12:31:12.072006000 -0700
@@ -55,7 +55,7 @@
static inline DAT_RETURN
dapl_ep_modify_validate_parameters(DAT_EP_HANDLE ep_handle,
DAT_EP_PARAM_MASK mask,
- const DAT_EP_PARAM * ep_param,
+ const struct dat_ep_param *ep_param,
DAPL_IA ** ia_ptr,
DAPL_EP ** ep_ptr,
struct dat_ep_attr *ep_attr_ptr)
@@ -310,7 +310,7 @@
* DAT_INVALID_STATE
*/
DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE ep_handle, DAT_EP_PARAM_MASK mask,
- const DAT_EP_PARAM * ep_param)
+ const struct dat_ep_param *ep_param)
{
DAPL_IA *ia;
DAPL_EP *ep1, *ep2;
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl_ep_query.c linux-kernel8/dat-provider/dapl_ep_query.c
--- linux-kernel7/dat-provider/dapl_ep_query.c 2005-05-04 08:19:32.703961000 -0700
+++ linux-kernel8/dat-provider/dapl_ep_query.c 2005-05-09 12:31:30.215002000 -0700
@@ -58,7 +58,7 @@
* DAT_INVALID_PARAMETER
*/
DAT_RETURN
-dapl_ep_query(DAT_EP_HANDLE ep_handle, DAT_EP_PARAM * ep_param)
+dapl_ep_query(DAT_EP_HANDLE ep_handle, struct dat_ep_param *ep_param)
{
DAPL_EP *ep_ptr;
DAT_RETURN status;
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/dat-provider/dapl.h linux-kernel8/dat-provider/dapl.h
--- linux-kernel7/dat-provider/dapl.h 2005-05-09 12:16:33.808001000 -0700
+++ linux-kernel8/dat-provider/dapl.h 2005-05-09 12:29:25.404000000 -0700
@@ -302,7 +302,7 @@
struct dapl_ep {
DAPL_HEADER header;
/* What the DAT Consumer asked for */
- DAT_EP_PARAM param;
+ struct dat_ep_param param;
/* The RC Queue Pair (IBM OS API) */
ib_qp_handle_t qp_handle;
@@ -564,11 +564,11 @@
const struct dat_ep_attr *, /* ep_parameters */
DAT_EP_HANDLE *); /* ep_handle */
-extern DAT_RETURN dapl_ep_query(DAT_EP_HANDLE, DAT_EP_PARAM *);
+extern DAT_RETURN dapl_ep_query(DAT_EP_HANDLE, struct dat_ep_param *);
extern DAT_RETURN dapl_ep_modify(DAT_EP_HANDLE, /* ep_handle */
DAT_EP_PARAM_MASK, /* ep_args_mask */
- const DAT_EP_PARAM *); /* ep_args */
+ const struct dat_ep_param *); /* ep_args */
extern DAT_RETURN dapl_ep_connect(DAT_EP_HANDLE, /* ep_handle */
DAT_IA_ADDRESS_PTR, /* remote_ia_address */
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/test/dapltest/test/dapl_fft_queryinfo.c linux-kernel8/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel7/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-09 12:10:49.778020000 -0700
+++ linux-kernel8/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-09 12:29:25.437003000 -0700
@@ -53,7 +53,7 @@
DAT_EVD_HANDLE send_evd_handle;
DAT_EVD_HANDLE recv_evd_handle;
DAT_EP_HANDLE ep_handle;
- DAT_EP_PARAM ep_param;
+ struct dat_ep_param ep_param;
DAT_CNO_HANDLE cno_handle;
#ifndef __KDAPLTEST__
DAT_CNO_PARAM cno_param;
diff -Nur -X /home/tduffy/dontdiff linux-kernel7/test/dapltest/test/dapl_test_util.c linux-kernel8/test/dapltest/test/dapl_test_util.c
--- linux-kernel7/test/dapltest/test/dapl_test_util.c 2005-05-09 11:45:59.822013000 -0700
+++ linux-kernel8/test/dapltest/test/dapl_test_util.c 2005-05-09 12:31:59.724000000 -0700
@@ -37,7 +37,7 @@
{
unsigned char *module = "DT_query";
DAT_EVD_HANDLE async_evd_hdl; /* not used */
- DAT_EP_PARAM ep_params;
+ struct dat_ep_param ep_params;
DAT_RETURN ret;
DT_Tdep_Print_Head *phead;
More information about the general
mailing list