Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
diff -Nur -X /home/tduffy/dontdiff linux-kernel24/dat/dat.h
linux-kernel25/dat/dat.h
--- linux-kernel24/dat/dat.h 2005-05-09 14:05:28.655967000 -0700
+++ linux-kernel25/dat/dat.h 2005-05-09 14:08:31.214971000 -0700
@@ -1005,7 +1005,7 @@
};
/* General Interface Adapter attributes.*/
-typedef struct dat_ia_attr {
+struct dat_ia_attr {
char adapter_name[DAT_NAME_MAX_LENGTH];
char vendor_name[DAT_NAME_MAX_LENGTH];
u32 hardware_version_major;
@@ -1041,7 +1041,7 @@
struct dat_named_attr *transport_attr;
DAT_COUNT num_vendor_attr;
struct dat_named_attr *vendor_attr;
-} DAT_IA_ATTR;
+};
/* Provider attributes */
typedef enum dat_iov_ownership {
@@ -1117,7 +1117,7 @@
typedef DAT_RETURN (*DAT_IA_CLOSE_FUNC) (DAT_IA_HANDLE, DAT_CLOSE_FLAGS);
typedef DAT_RETURN (*DAT_IA_QUERY_FUNC) (DAT_IA_HANDLE, DAT_EVD_HANDLE *,
- DAT_IA_ATTR *,
+ struct dat_ia_attr *,
struct dat_provider_attr *);
typedef DAT_RETURN (*DAT_SET_CONSUMER_CONTEXT_FUNC) (DAT_HANDLE, DAT_CONTEXT);
@@ -1439,7 +1439,7 @@
static inline DAT_RETURN dat_ia_query(DAT_IA_HANDLE ia,
DAT_EVD_HANDLE * async_evd,
- DAT_IA_ATTR * ia_attr,
+ struct dat_ia_attr *ia_attr,
struct dat_provider_attr *provider_attr)
{
return DAT_CALL_PROVIDER_FUNC(
diff -Nur -X /home/tduffy/dontdiff
linux-kernel24/dat-provider/dapl_adapter_util.h
linux-kernel25/dat-provider/dapl_adapter_util.h
--- linux-kernel24/dat-provider/dapl_adapter_util.h 2005-05-09
12:17:54.079004000 -0700
+++ linux-kernel25/dat-provider/dapl_adapter_util.h 2005-05-09
14:09:01.530972000 -0700
@@ -146,7 +146,7 @@
DAPL_COOKIE * cookie, DAT_BOOLEAN is_signaled);
DAT_RETURN dapl_ib_query_hca(DAPL_HCA * hca_ptr,
- DAT_IA_ATTR * ia_attr,
+ struct dat_ia_attr *ia_attr,
struct dat_ep_attr *ep_attr,
DAT_SOCK_ADDR6 * ip_addr);
diff -Nur -X /home/tduffy/dontdiff linux-kernel24/dat-provider/dapl.h
linux-kernel25/dat-provider/dapl.h
--- linux-kernel24/dat-provider/dapl.h 2005-05-09 14:05:04.217962000 -0700
+++ linux-kernel25/dat-provider/dapl.h 2005-05-09 14:08:06.217043000 -0700
@@ -221,7 +221,7 @@
/* Memory Subsystem Support */
DAPL_HASH_TABLE *lmr_hash_table;
/* Limits & useful HCA attributes */
- DAT_IA_ATTR ia_attr;
+ struct dat_ia_attr ia_attr;
};
/* DAPL Objects always have the following header */
@@ -486,7 +486,7 @@
extern DAT_RETURN dapl_ia_query(DAT_IA_HANDLE,
DAT_EVD_HANDLE *,
- DAT_IA_ATTR *,
+ struct dat_ia_attr *,
struct dat_provider_attr *);
/* helper functions */
diff -Nur -X /home/tduffy/dontdiff linux-kernel24/dat-provider/dapl_ia_query.c
linux-kernel25/dat-provider/dapl_ia_query.c
--- linux-kernel24/dat-provider/dapl_ia_query.c 2005-05-09 11:18:08.146002000
-0700
+++ linux-kernel25/dat-provider/dapl_ia_query.c 2005-05-09 14:09:22.845962000
-0700
@@ -62,7 +62,7 @@
DAT_RETURN
dapl_ia_query(DAT_IA_HANDLE ia_handle,
DAT_EVD_HANDLE * async_evd_handle,
- DAT_IA_ATTR * ia_attr,
+ struct dat_ia_attr *ia_attr,
struct dat_provider_attr *provider_attr)
{
DAPL_IA *ia_ptr;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel24/dat-provider/dapl_openib_util.c
linux-kernel25/dat-provider/dapl_openib_util.c
--- linux-kernel24/dat-provider/dapl_openib_util.c 2005-05-09
12:22:39.554000000 -0700
+++ linux-kernel25/dat-provider/dapl_openib_util.c 2005-05-09
14:09:32.103960000 -0700
@@ -746,7 +746,7 @@
* DAT_INVALID_PARAMETER
*/
DAT_RETURN dapl_ib_query_hca(DAPL_HCA * hca_ptr,
- DAT_IA_ATTR * ia_attr,
+ struct dat_ia_attr *ia_attr,
struct dat_ep_attr *ep_attr,
DAT_SOCK_ADDR6 * ip_addr)
{
diff -Nur -X /home/tduffy/dontdiff linux-kernel24/dat-provider/dapl_vendor.h
linux-kernel25/dat-provider/dapl_vendor.h
--- linux-kernel24/dat-provider/dapl_vendor.h 2005-05-09 11:15:26.435002000
-0700
+++ linux-kernel25/dat-provider/dapl_vendor.h 2005-05-09 14:08:06.235963000
-0700
@@ -31,14 +31,14 @@
*
* PURPOSE:
* Vendor provides values for their implementation. Most of
- * these values are returned in the DAT_IA_ATTR parameter of
+ * these values are returned in the struct dat_ia_attr parameter of
* dat_ia_query()
*
* $Id: dapl_vendor.h 2190 2005-04-19 20:01:29Z jlentini $
**********************************************************************/
/**********************************************************************
- * DAT_IA_ATTR attributes
+ * struct dat_ia_attr attributes
*
* These values are used in the provider support routine
* dapl_ib_query_hca (). Many of the values there are HW
@@ -50,13 +50,13 @@
/*
* Product name of the adapter.
- * Returned in DAT_IA_ATTR.adapter_name
+ * Returned in struct dat_ia_attr.adapter_name
*/
#define VN_ADAPTER_NAME "Generic InfiniBand HCA"
/*
* Vendor name
- * Returned in DAT_IA_ATTR.vendor_name
+ * Returned in struct dat_ia_attr.vendor_name
*/
#define VN_VENDOR_NAME "DAPL Reference Implementation"
diff -Nur -X /home/tduffy/dontdiff
linux-kernel24/test/dapltest/include/dapl_performance_test.h
linux-kernel25/test/dapltest/include/dapl_performance_test.h
--- linux-kernel24/test/dapltest/include/dapl_performance_test.h
2005-05-09 12:22:53.931012000 -0700
+++ linux-kernel25/test/dapltest/include/dapl_performance_test.h
2005-05-09 14:09:53.078968000 -0700
@@ -69,7 +69,7 @@
DAT_IA_ADDRESS_PTR remote_ia_addr;
DAT_BOOLEAN is_remote_little_endian;
DAT_CONN_QUAL base_port;
- DAT_IA_ATTR ia_attr;
+ struct dat_ia_attr ia_attr;
DAT_IA_HANDLE ia_handle;
DAT_PZ_HANDLE pz_handle;
DAT_CNO_HANDLE cno_handle;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel24/test/dapltest/include/dapl_test_data.h
linux-kernel25/test/dapltest/include/dapl_test_data.h
--- linux-kernel24/test/dapltest/include/dapl_test_data.h 2005-05-09
12:16:33.875003000 -0700
+++ linux-kernel25/test/dapltest/include/dapl_test_data.h 2005-05-09
14:08:06.256979000 -0700
@@ -80,7 +80,7 @@
Server_Info_t Server_Info;
Client_Info_t Client_Info;
Params_t Params;
- DAT_IA_ATTR ia_attr;
+ struct dat_ia_attr ia_attr;
struct dat_provider_attr provider_attr;
struct dat_ep_attr ep_attr;
Per_Server_Data_t *ps_ptr;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel24/test/dapltest/test/dapl_fft_queryinfo.c
linux-kernel25/test/dapltest/test/dapl_fft_queryinfo.c
--- linux-kernel24/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-09
14:05:04.246964000 -0700
+++ linux-kernel25/test/dapltest/test/dapl_fft_queryinfo.c 2005-05-09
14:08:06.261014000 -0700
@@ -45,7 +45,7 @@
{
char *dev_name;
DAT_IA_HANDLE ia_handle;
- DAT_IA_ATTR ia_attributes;
+ struct dat_ia_attr ia_attributes;
struct dat_provider_attr provider_attributes;
DAT_EVD_HANDLE evd_handle;
DAT_EVD_HANDLE conn_evd_handle;
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
