Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
diff -Nur -X /home/tduffy/dontdiff linux-kernel21/dat/dat.h
linux-kernel22/dat/dat.h
--- linux-kernel21/dat/dat.h 2005-05-09 13:32:35.923960000 -0700
+++ linux-kernel22/dat/dat.h 2005-05-09 13:55:55.040963000 -0700
@@ -934,17 +934,17 @@
typedef void (*DAT_UPCALL_FUNC) (DAT_PVOID, const struct dat_event *,
DAT_BOOLEAN);
-typedef struct dat_upcall_object {
+struct dat_upcall_object {
DAT_PVOID instance_data;
DAT_UPCALL_FUNC upcall_func;
-} DAT_UPCALL_OBJECT;
+};
/* Define NULL upcall */
#define DAT_UPCALL_NULL \
- ((DAT_UPCALL_OBJECT) { (DAT_PVOID) NULL, (DAT_UPCALL_FUNC) NULL })
+ ((struct dat_upcall_object) { (DAT_PVOID) NULL, (DAT_UPCALL_FUNC) NULL
})
-#define DAT_UPCALL_SAME ((DAT_UPCALL_OBJECT *) NULL)
+#define DAT_UPCALL_SAME ((struct dat_upcall_object *) NULL)
/* Provider/registration info */
@@ -959,7 +959,7 @@
DAT_IA_HANDLE ia_handle;
DAT_COUNT evd_qlen;
DAT_UPCALL_POLICY upcall_policy;
- DAT_UPCALL_OBJECT upcall;
+ struct dat_upcall_object upcall;
DAT_EVD_FLAGS evd_flags;
} DAT_EVD_PARAM;
@@ -1272,11 +1272,12 @@
DAT_VLEN *, DAT_VADDR *);
typedef DAT_RETURN (*DAT_EVD_KCREATE_FUNC) (
- DAT_IA_HANDLE, DAT_COUNT, DAT_UPCALL_POLICY, const DAT_UPCALL_OBJECT *,
+ DAT_IA_HANDLE, DAT_COUNT, DAT_UPCALL_POLICY,
+ const struct dat_upcall_object *,
DAT_EVD_FLAGS, DAT_EVD_HANDLE *);
typedef DAT_RETURN (*DAT_EVD_MODIFY_UPCALL_FUNC) (
- DAT_EVD_HANDLE, DAT_UPCALL_POLICY, const DAT_UPCALL_OBJECT *);
+ DAT_EVD_HANDLE, DAT_UPCALL_POLICY, const struct dat_upcall_object *);
struct dat_provider {
const char *device_name;
@@ -1483,7 +1484,7 @@
static inline DAT_RETURN dat_evd_kcreate(DAT_IA_HANDLE ia,
DAT_COUNT qlen,
DAT_UPCALL_POLICY policy,
- const DAT_UPCALL_OBJECT * upcall,
+ const struct dat_upcall_object
*upcall,
DAT_EVD_FLAGS flags,
DAT_EVD_HANDLE * evd)
{
@@ -1493,7 +1494,7 @@
static inline DAT_RETURN dat_evd_modify_upcall(DAT_EVD_HANDLE evd,
DAT_UPCALL_POLICY policy,
- const DAT_UPCALL_OBJECT *
upcall)
+ const struct dat_upcall_object
*upcall)
{
return DAT_CALL_PROVIDER_FUNC(
evd_modify_upcall_func, evd, policy, upcall);
diff -Nur -X /home/tduffy/dontdiff linux-kernel21/dat-provider/dapl_cno_util.c
linux-kernel22/dat-provider/dapl_cno_util.c
--- linux-kernel21/dat-provider/dapl_cno_util.c 2005-05-09 13:39:21.136968000
-0700
+++ linux-kernel22/dat-provider/dapl_cno_util.c 2005-05-09 13:57:23.215962000
-0700
@@ -41,9 +41,7 @@
* alloc and initialize an EVD struct
*/
DAPL_CNO *
-dapl_cno_alloc (
- DAPL_IA *ia_ptr,
- const DAT_UPCALL_OBJECT *upcall)
+dapl_cno_alloc(DAPL_IA *ia_ptr, const struct dat_upcall_object *upcall)
{
DAPL_CNO *cno_ptr;
diff -Nur -X /home/tduffy/dontdiff linux-kernel21/dat-provider/dapl_cno_util.h
linux-kernel22/dat-provider/dapl_cno_util.h
--- linux-kernel21/dat-provider/dapl_cno_util.h 2005-04-20 12:42:07.836018000
-0700
+++ linux-kernel22/dat-provider/dapl_cno_util.h 2005-05-09 13:57:53.648969000
-0700
@@ -37,9 +37,7 @@
#include "dapl.h"
DAPL_CNO *
-dapl_cno_alloc (
- DAPL_IA *ia_ptr,
- const DAT_UPCALL_OBJECT *upcall) ;
+dapl_cno_alloc(DAPL_IA *ia_ptr, const struct dat_upcall_object *upcall);
void
dapl_cno_dealloc (
diff -Nur -X /home/tduffy/dontdiff
linux-kernel21/dat-provider/dapl_evd_kcreate.c
linux-kernel22/dat-provider/dapl_evd_kcreate.c
--- linux-kernel21/dat-provider/dapl_evd_kcreate.c 2005-05-09
11:07:01.955004000 -0700
+++ linux-kernel22/dat-provider/dapl_evd_kcreate.c 2005-05-09
13:58:06.581973000 -0700
@@ -50,7 +50,7 @@
DAT_RETURN dapl_evd_kcreate(DAT_IA_HANDLE ia_handle, DAT_COUNT evd_min_qlen,
DAT_UPCALL_POLICY upcall_policy, /* ignore */
- const DAT_UPCALL_OBJECT * upcall,
+ const struct dat_upcall_object *upcall,
DAT_EVD_FLAGS evd_flags,
DAT_EVD_HANDLE * evd_handle)
{
diff -Nur -X /home/tduffy/dontdiff
linux-kernel21/dat-provider/dapl_evd_modify_upcall.c
linux-kernel22/dat-provider/dapl_evd_modify_upcall.c
--- linux-kernel21/dat-provider/dapl_evd_modify_upcall.c 2005-04-20
12:42:07.397019000 -0700
+++ linux-kernel22/dat-provider/dapl_evd_modify_upcall.c 2005-05-09
13:58:27.721975000 -0700
@@ -43,8 +43,9 @@
* Modify the upcall instance on an EVD
*/
-DAT_RETURN dapl_evd_modify_upcall(DAT_EVD_HANDLE evd_handle, DAT_UPCALL_POLICY
upcall_policy, /* ignore */
- const DAT_UPCALL_OBJECT * upcall)
+DAT_RETURN dapl_evd_modify_upcall(DAT_EVD_HANDLE evd_handle,
+ DAT_UPCALL_POLICY upcall_policy, /* ignore */
+ const struct dat_upcall_object *upcall)
{
DAPL_EVD *evd_ptr;
DAPL_CNO *cno_ptr;
diff -Nur -X /home/tduffy/dontdiff linux-kernel21/dat-provider/dapl.h
linux-kernel22/dat-provider/dapl.h
--- linux-kernel21/dat-provider/dapl.h 2005-05-09 13:37:15.817963000 -0700
+++ linux-kernel22/dat-provider/dapl.h 2005-05-09 13:59:10.723960000 -0700
@@ -254,11 +254,10 @@
};
/* DAPL_CNO maps to DAT_CNO_HANDLE */
-struct dapl_cno
-{
+struct dapl_cno {
DAPL_HEADER header;
- DAT_UPCALL_OBJECT cno_upcall;
- DAT_UPCALL_POLICY cno_upcall_policy;
+ struct dat_upcall_object cno_upcall;
+ DAT_UPCALL_POLICY cno_upcall_policy;
};
/* DAPL_EVD maps to DAT_EVD_HANDLE */
@@ -525,7 +524,7 @@
extern DAT_RETURN dapl_evd_kcreate(DAT_IA_HANDLE, /* ia_handle */
DAT_COUNT, /* evd_min_qlen */
DAT_UPCALL_POLICY, /* upcall_policy */
- const DAT_UPCALL_OBJECT *, /* upcall */
+ const struct dat_upcall_object *,/* upcall */
DAT_EVD_FLAGS, /* evd_flags */
DAT_EVD_HANDLE *); /* evd_handle */
@@ -534,7 +533,7 @@
extern DAT_RETURN dapl_evd_modify_upcall(DAT_EVD_HANDLE, /* evd_handle */
DAT_UPCALL_POLICY, /*
upcall_policy */
- const DAT_UPCALL_OBJECT *); /*
upcall */
+ const struct dat_upcall_object *);
/* upcall */
extern DAT_RETURN dapl_evd_enable(DAT_EVD_HANDLE); /* evd_handle */
diff -Nur -X /home/tduffy/dontdiff
linux-kernel21/test/dapltest/kdapl/kdapl_tdep_evd.c
linux-kernel22/test/dapltest/kdapl/kdapl_tdep_evd.c
--- linux-kernel21/test/dapltest/kdapl/kdapl_tdep_evd.c 2005-05-09
13:38:10.908963000 -0700
+++ linux-kernel22/test/dapltest/kdapl/kdapl_tdep_evd.c 2005-05-09
13:59:26.957963000 -0700
@@ -103,7 +103,7 @@
{
DAT_RETURN dat_status;
- DAT_UPCALL_OBJECT upcall;
+ struct dat_upcall_object upcall;
Tdep_Evd *evd_ptr;
evd_ptr = NULL;
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
