Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
diff -Nur -X /home/tduffy/dontdiff linux-kernel5/dat/dat.h
linux-kernel6/dat/dat.h
--- linux-kernel5/dat/dat.h 2005-05-09 11:56:32.977020000 -0700
+++ linux-kernel6/dat/dat.h 2005-05-09 12:09:01.001003000 -0700
@@ -563,13 +563,13 @@
(DAT_MEM_PRIV_LOCAL_WRITE_FLAG | DAT_MEM_PRIV_REMOTE_WRITE_FLAG)
/* RMR Arguments */
-typedef struct dat_rmr_param {
+struct dat_rmr_param {
DAT_IA_HANDLE ia_handle;
DAT_PZ_HANDLE pz_handle;
struct dat_lmr_triplet lmr_triplet;
DAT_MEM_PRIV_FLAGS mem_priv;
DAT_RMR_CONTEXT rmr_context;
-} DAT_RMR_PARAM;
+};
/* Endpoint attributes */
typedef struct dat_ep_attr {
@@ -1208,7 +1208,7 @@
typedef DAT_RETURN (*DAT_RMR_CREATE_FUNC) (DAT_PZ_HANDLE, DAT_RMR_HANDLE *);
-typedef DAT_RETURN (*DAT_RMR_QUERY_FUNC) (DAT_RMR_HANDLE, DAT_RMR_PARAM *);
+typedef DAT_RETURN (*DAT_RMR_QUERY_FUNC) (DAT_RMR_HANDLE, struct dat_rmr_param
*);
typedef DAT_RETURN (*DAT_RMR_BIND_FUNC) (
DAT_RMR_HANDLE, const struct dat_lmr_triplet *, DAT_MEM_PRIV_FLAGS,
@@ -1688,7 +1688,7 @@
return DAT_CALL_PROVIDER_FUNC(rmr_create_func, pz, rmr);
}
-static inline DAT_RETURN dat_rmr_query(DAT_RMR_HANDLE rmr, DAT_RMR_PARAM *
param)
+static inline DAT_RETURN dat_rmr_query(DAT_RMR_HANDLE rmr, struct
dat_rmr_param *param)
{
return DAT_CALL_PROVIDER_FUNC(rmr_query_func, rmr, param);
}
diff -Nur -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl.h
linux-kernel6/dat-provider/dapl.h
--- linux-kernel5/dat-provider/dapl.h 2005-05-09 11:49:45.236005000 -0700
+++ linux-kernel6/dat-provider/dapl.h 2005-05-09 12:08:08.092003000 -0700
@@ -366,7 +366,7 @@
/* DAPL_RMR maps to DAT_RMR_HANDLE */
struct dapl_rmr {
DAPL_HEADER header;
- DAT_RMR_PARAM param;
+ struct dat_rmr_param param;
DAPL_EP *ep;
DAPL_PZ *pz;
DAPL_LMR *lmr;
@@ -674,7 +674,7 @@
DAT_RMR_HANDLE *); /* rmr_handle */
extern DAT_RETURN dapl_rmr_query(DAT_RMR_HANDLE, /* rmr_handle */
- DAT_RMR_PARAM *); /* rmr_args */
+ struct dat_rmr_param *); /* rmr_args */
extern DAT_RETURN dapl_rmr_bind(DAT_RMR_HANDLE, /* rmr_handle */
const struct dat_lmr_triplet *, /* lmr_triplet
*/
diff -Nur -X /home/tduffy/dontdiff linux-kernel5/dat-provider/dapl_rmr_query.c
linux-kernel6/dat-provider/dapl_rmr_query.c
--- linux-kernel5/dat-provider/dapl_rmr_query.c 2005-05-04 08:19:32.691008000
-0700
+++ linux-kernel6/dat-provider/dapl_rmr_query.c 2005-05-09 12:10:37.270017000
-0700
@@ -38,7 +38,8 @@
#include "dapl.h"
-DAT_RETURN dapl_rmr_query(DAT_RMR_HANDLE rmr_handle, DAT_RMR_PARAM * rmr_param)
+DAT_RETURN dapl_rmr_query(DAT_RMR_HANDLE rmr_handle,
+ struct dat_rmr_param *rmr_param)
{
DAPL_RMR *rmr;
DAT_RETURN dat_status;
@@ -57,7 +58,7 @@
rmr = (DAPL_RMR *) rmr_handle;
- memcpy(rmr_param, &rmr->param, sizeof(DAT_RMR_PARAM));
+ memcpy(rmr_param, &rmr->param, sizeof *rmr_param);
bail:
return dat_status;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel5/test/dapltest/test/dapl_fft_queryinfo.c
linux-kernel6/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel5/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-09
11:15:26.469002000 -0700
+++ linux-kernel6/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-09
12:10:49.778020000 -0700
@@ -69,7 +69,7 @@
DAT_LMR_PARAM lmr_param;
DAT_LMR_CONTEXT lmr_context;
DAT_RMR_HANDLE rmr_handle;
- DAT_RMR_PARAM rmr_param;
+ struct dat_rmr_param rmr_param;
DAT_REGION_DESCRIPTION region;
DAT_VLEN reg_size;
DAT_VADDR reg_addr;
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
