[openib-general] [PATCH][9/26] kDAPL: Remove typedef DAT_SRQ_ATTR

[Tom Duffy]

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

diff -Nur -X /home/tduffy/dontdiff linux-kernel8/dat/dat.h linux-kernel9/dat/dat.h
--- linux-kernel8/dat/dat.h	2005-05-09 12:30:15.364000000 -0700
+++ linux-kernel9/dat/dat.h	2005-05-09 12:37:03.881002000 -0700
@@ -670,11 +670,11 @@
 
 #define DAT_VALUE_UNKNOWN (((DAT_COUNT) ~0)-1)
 
-typedef struct dat_srq_attr {
+struct dat_srq_attr {
 	DAT_COUNT max_recv_dtos;
 	DAT_COUNT max_recv_iov;
 	DAT_COUNT low_watermark;
-} DAT_SRQ_ATTR;
+};
 
 typedef struct dat_srq_param {
 	DAT_IA_HANDLE ia_handle;
@@ -1243,7 +1243,7 @@
 typedef DAT_RETURN (*DAT_PZ_FREE_FUNC) (DAT_PZ_HANDLE);
 
 typedef DAT_RETURN (*DAT_SRQ_CREATE_FUNC) (
-        DAT_IA_HANDLE, DAT_PZ_HANDLE, DAT_SRQ_ATTR *, DAT_SRQ_HANDLE *);
+        DAT_IA_HANDLE, DAT_PZ_HANDLE, struct dat_srq_attr *, DAT_SRQ_HANDLE *);
 
 typedef DAT_RETURN (*DAT_SRQ_SET_LW_FUNC) (DAT_SRQ_HANDLE, DAT_COUNT);
 
@@ -1777,7 +1777,7 @@
 
 static inline DAT_RETURN dat_srq_create(DAT_IA_HANDLE ia, 
                                         DAT_PZ_HANDLE pz, 
-                                        DAT_SRQ_ATTR * attr,
+                                        struct dat_srq_attr *attr,
                                         DAT_SRQ_HANDLE * srq)
 {
         return DAT_CALL_PROVIDER_FUNC(srq_create_func, ia, pz, attr, srq);
diff -Nur -X /home/tduffy/dontdiff linux-kernel8/dat-provider/dapl.h linux-kernel9/dat-provider/dapl.h
--- linux-kernel8/dat-provider/dapl.h	2005-05-09 12:29:25.404000000 -0700
+++ linux-kernel9/dat-provider/dapl.h	2005-05-09 12:36:45.218002000 -0700
@@ -730,7 +730,7 @@
 
 extern DAT_RETURN dapl_srq_create(DAT_IA_HANDLE,	/* ia_handle            */
 				  DAT_PZ_HANDLE,	/* pz_handle            */
-				  DAT_SRQ_ATTR *,	/* srq_attr             */
+				  struct dat_srq_attr *,	/* srq_attr             */
 				  DAT_SRQ_HANDLE *);	/* srq_handle           */
 
 extern DAT_RETURN dapl_srq_free(DAT_SRQ_HANDLE);	/* srq_handle           */
diff -Nur -X /home/tduffy/dontdiff linux-kernel8/dat-provider/dapl_srq_create.c linux-kernel9/dat-provider/dapl_srq_create.c
--- linux-kernel8/dat-provider/dapl_srq_create.c	2005-04-20 12:42:06.794011000 -0700
+++ linux-kernel9/dat-provider/dapl_srq_create.c	2005-05-09 12:37:34.949031000 -0700
@@ -68,7 +68,7 @@
 DAT_RETURN
 dapl_srq_create(DAT_IA_HANDLE ia_handle,
 		DAT_PZ_HANDLE pz_handle,
-		DAT_SRQ_ATTR * srq_attr, DAT_SRQ_HANDLE * srq_handle)
+		struct dat_srq_attr *srq_attr, DAT_SRQ_HANDLE * srq_handle)
 {
 	DAPL_IA *ia_ptr;
 	DAPL_SRQ *srq_ptr;
diff -Nur -X /home/tduffy/dontdiff linux-kernel8/dat-provider/dapl_srq_util.c linux-kernel9/dat-provider/dapl_srq_util.c
--- linux-kernel8/dat-provider/dapl_srq_util.c	2005-04-27 11:38:35.075003000 -0700
+++ linux-kernel9/dat-provider/dapl_srq_util.c	2005-05-09 12:37:47.386013000 -0700
@@ -54,7 +54,7 @@
  * 	pointer to srq
  *
  */
-DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia_ptr, const DAT_SRQ_ATTR * srq_attr)
+DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia_ptr, const struct dat_srq_attr *srq_attr)
 {
 	DAPL_SRQ *srq_ptr;
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel8/dat-provider/dapl_srq_util.h linux-kernel9/dat-provider/dapl_srq_util.h
--- linux-kernel8/dat-provider/dapl_srq_util.h	2005-04-20 12:42:07.197020000 -0700
+++ linux-kernel9/dat-provider/dapl_srq_util.h	2005-05-09 12:38:01.695005000 -0700
@@ -41,7 +41,8 @@
 
 /* function prototypes */
 
-extern DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia, const DAT_SRQ_ATTR * srq_attr);
+extern DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia,
+				const struct dat_srq_attr *srq_attr);
 
 extern void dapl_srq_dealloc(DAPL_SRQ * srq_ptr);