You can ignore the tabs/space changes. Just make sure the other 3
changes are ok.
dat.h, udat_config.h and udat.h
1.
diff -Naur ./dat/include/dat/dat.h
../openfabrics/dapl/dat/include/dat/dat.h
--- ./dat/include/dat/dat.h 2006-11-10 18:37:09.000000000 -0800
+++ ../openfabrics/dapl/dat/include/dat/dat.h 2007-05-16
12:51:44.372347952 -0700
@@ -401,16 +401,13 @@
/* To support backwards compatibility for DAPL-1.0 & DAPL-1.1 */
#define max_mtu_size max_message_size
-#ifdef DAT_EXTENSIONS
-/* DAPL 2.0 addition */
-/* Defines extensions */
+/* Query for provider IA extension support */
typedef enum dat_extension
{
+ DAT_EXTENSION_NONE,/* no extension supported. */
DAT_EXTENSION_IB, /* IB extension. */
- DAT_EXTENSION_IW, /* iWARP extension. */
- DAT_EXTENSION_NONE /* no extension supported. */
+ DAT_EXTENSION_IW /* iWARP extension. */
} DAT_EXTENSION;
-#endif /* DAT_EXTENSIONS */
typedef struct dat_ia_attr DAT_IA_ATTR;
@@ -451,6 +448,7 @@
#define DAT_IA_FIELD_IA_MAX_RDMA_READ_PER_EP_IN_GUARANTEED
UINT64_C(0x020000000)
#define DAT_IA_FIELD_IA_MAX_RDMA_READ_PER_EP_OUT_GUARANTEED
UINT64_C(0x040000000)
#define DAT_IA_FIELD_IA_ZB_SUPPORTED
UINT64_C(0x080000000)
+#define DAT_IA_FIELD_IA_EXTENSIONS_SUPPORTED
UINT64_C(0x100000000)
/* To support backwards compatibility for DAPL-1.0 & DAPL-1.1 */
#define DAT_IA_ALL
DAT_IA_FIELD_ALL
2.
diff -Naur ./dat/include/dat/udat_config.h
../openfabrics/dapl/dat/include/dat/udat_config.h
--- ./dat/include/dat/udat_config.h 2006-11-09 15:10:02.000000000
-0800
+++ ../openfabrics/dapl/dat/include/dat/udat_config.h 2007-05-16
12:51:44.388345520 -0700
@@ -50,8 +50,8 @@
#ifndef _UDAT_CONFIG_H_
#define _UDAT_CONFIG_H_
-#define DAT_VERSION_MAJOR 1
-#define DAT_VERSION_MINOR 2
+#define DAT_VERSION_MAJOR 2
+#define DAT_VERSION_MINOR 0
/*
* The official header files will default DAT_THREADSAFE to DAT_TRUE.
If
3.
diff -Naur ./dat/include/dat/udat.h
../openfabrics/dapl/dat/include/dat/udat.h
--- ./dat/include/dat/udat.h 2006-11-10 18:39:16.000000000 -0800
+++ ../openfabrics/dapl/dat/include/dat/udat.h 2007-05-16
12:51:44.392344912 -0700
@@ -292,20 +292,17 @@
DAT_BOOLEAN max_rdma_read_per_ep_in_guaranteed;
DAT_BOOLEAN max_rdma_read_per_ep_out_guaranteed;
DAT_BOOLEAN zb_supported;
-#ifdef DAT_EXTENSIONS
DAT_EXTENSION extension_supported;
DAT_COUNT extension_version;
-#endif /* DAT_EXTENSIONS */
DAT_COUNT num_transport_attr;
DAT_NAMED_ATTR *transport_attr;
DAT_COUNT num_vendor_attr;
DAT_NAMED_ATTR *vendor_attr;
};
-#ifdef DAT_EXTENSIONS
+
#define DAT_IA_FIELD_IA_EXTENSION
UINT64_C(0x100000000)
#define DAT_IA_FIELD_IA_EXTENSION_VERSION
UINT64_C(0x200000000)
-#endif /* DAT_EXTENSIONS */
#define DAT_IA_FIELD_IA_NUM_TRANSPORT_ATTR
UINT64_C(0x400000000)
#define DAT_IA_FIELD_IA_TRANSPORT_ATTR
UINT64_C(0x800000000)