Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>

diff -Nur -X /home/tduffy/dontdiff linux-kernel9/dat/dat.h 
linux-kernel10/dat/dat.h
--- linux-kernel9/dat/dat.h     2005-05-09 12:37:03.881002000 -0700
+++ linux-kernel10/dat/dat.h    2005-05-09 12:40:19.541004000 -0700
@@ -676,7 +676,7 @@
        DAT_COUNT low_watermark;
 };
 
-typedef struct dat_srq_param {
+struct dat_srq_param {
        DAT_IA_HANDLE ia_handle;
        DAT_SRQ_STATE srq_state;
        DAT_PZ_HANDLE pz_handle;
@@ -685,7 +685,7 @@
        DAT_COUNT low_watermark;
        DAT_COUNT available_dto_count;
        DAT_COUNT outstanding_dto_count;
-} DAT_SRQ_PARAM;
+};
 
 /* PZ Parameters */
 
@@ -1249,7 +1249,8 @@
 
 typedef DAT_RETURN (*DAT_SRQ_FREE_FUNC) (DAT_SRQ_HANDLE);
 
-typedef DAT_RETURN (*DAT_SRQ_QUERY_FUNC) (DAT_SRQ_HANDLE, DAT_SRQ_PARAM *);
+typedef DAT_RETURN (*DAT_SRQ_QUERY_FUNC) (DAT_SRQ_HANDLE,
+                                         struct dat_srq_param *);
 
 typedef DAT_RETURN (*DAT_SRQ_RESIZE_FUNC) (DAT_SRQ_HANDLE, DAT_COUNT);
 
@@ -1797,7 +1798,8 @@
                 srq_post_recv_func, srq, num_iovs, iovs, cookie);
 }
 
-static inline DAT_RETURN dat_srq_query(DAT_SRQ_HANDLE srq, DAT_SRQ_PARAM * 
param)
+static inline DAT_RETURN dat_srq_query(DAT_SRQ_HANDLE srq,
+                                      struct dat_srq_param *param)
 {
         return DAT_CALL_PROVIDER_FUNC(srq_query_func, srq, param);
 }
diff -Nur -X /home/tduffy/dontdiff linux-kernel9/dat-provider/dapl.h 
linux-kernel10/dat-provider/dapl.h
--- linux-kernel9/dat-provider/dapl.h   2005-05-09 12:36:45.218002000 -0700
+++ linux-kernel10/dat-provider/dapl.h  2005-05-09 12:39:52.484000000 -0700
@@ -342,7 +342,7 @@
 /* DAPL_SRQ maps to DAT_SRQ_HANDLE */
 struct dapl_srq {
        DAPL_HEADER header;
-       DAT_SRQ_PARAM param;
+       struct dat_srq_param param;
        atomic_t srq_ref_count;
        DAPL_COOKIE_BUFFER recv_buffer;
        atomic_t recv_count;
@@ -741,7 +741,7 @@
                                     DAT_DTO_COOKIE);   /* user_cookie          
*/
 
 extern DAT_RETURN dapl_srq_query(DAT_SRQ_HANDLE,       /* srq_handle           
*/
-                                DAT_SRQ_PARAM *);      /* srq_param            
*/
+                                struct dat_srq_param *);       /* srq_param    
        */
 
 extern DAT_RETURN dapl_srq_resize(DAT_SRQ_HANDLE,      /* srq_handle           
*/
                                  DAT_COUNT);   /* srq_max_recv_dto     */
diff -Nur -X /home/tduffy/dontdiff linux-kernel9/dat-provider/dapl_srq_free.c 
linux-kernel10/dat-provider/dapl_srq_free.c
--- linux-kernel9/dat-provider/dapl_srq_free.c  2005-04-27 11:38:35.594003000 
-0700
+++ linux-kernel10/dat-provider/dapl_srq_free.c 2005-05-09 12:39:52.487003000 
-0700
@@ -63,7 +63,7 @@
 {
        DAPL_SRQ *srq_ptr;
        DAPL_IA *ia_ptr;
-       DAT_SRQ_PARAM *param;
+       struct dat_srq_param *param;
        DAT_RETURN dat_status;
 
        dat_status = DAT_SUCCESS;
diff -Nur -X /home/tduffy/dontdiff linux-kernel9/dat-provider/dapl_srq_query.c 
linux-kernel10/dat-provider/dapl_srq_query.c
--- linux-kernel9/dat-provider/dapl_srq_query.c 2005-05-04 08:19:32.624965000 
-0700
+++ linux-kernel10/dat-provider/dapl_srq_query.c        2005-05-09 
12:40:58.336002000 -0700
@@ -39,7 +39,8 @@
 
 #include "dapl.h"
 
-DAT_RETURN dapl_srq_query(DAT_SRQ_HANDLE srq_handle, DAT_SRQ_PARAM * srq_param)
+DAT_RETURN dapl_srq_query(DAT_SRQ_HANDLE srq_handle,
+                         struct dat_srq_param *srq_param)
 {
        DAPL_SRQ *srq_ptr;
        DAT_RETURN dat_status;

_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general

To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general

Reply via email to