[openib-general] [PATCH][5/26] kDAPL: Remove typedef DAT_NAMED_ATTR

[Tom Duffy]

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

diff -Nur -X /home/tduffy/dontdiff linux-kernel4/dat/dat.h linux-kernel5/dat/dat.h
--- linux-kernel4/dat/dat.h	2005-05-09 11:50:52.631016000 -0700
+++ linux-kernel5/dat/dat.h	2005-05-09 11:56:32.977020000 -0700
@@ -361,10 +361,10 @@
 typedef char *DAT_NAME_PTR;
 #define DAT_NAME_MAX_LENGTH     256
 
-typedef struct dat_named_attr {
+struct dat_named_attr {
 	const char *name;
 	const char *value;
-} DAT_NAMED_ATTR;
+};
 
 typedef enum dat_boolean {
 	DAT_FALSE = 0,
@@ -588,9 +588,9 @@
 	DAT_COUNT max_rdma_read_iov;
 	DAT_COUNT max_rdma_write_iov;
 	DAT_COUNT ep_transport_specific_count;
-	DAT_NAMED_ATTR *ep_transport_specific;
+	struct dat_named_attr *ep_transport_specific;
 	DAT_COUNT ep_provider_specific_count;
-	DAT_NAMED_ATTR *ep_provider_specific;
+	struct dat_named_attr *ep_provider_specific;
 } DAT_EP_ATTR;
 
 /* Endpoint Parameters */
@@ -1037,9 +1037,9 @@
 	DAT_BOOLEAN max_rdma_read_per_ep_in_guaranteed;
 	DAT_BOOLEAN max_rdma_read_per_ep_out_guaranteed;
 	DAT_COUNT num_transport_attr;
-	DAT_NAMED_ATTR *transport_attr;
+	struct dat_named_attr *transport_attr;
 	DAT_COUNT num_vendor_attr;
-	DAT_NAMED_ATTR *vendor_attr;
+	struct dat_named_attr *vendor_attr;
 } DAT_IA_ATTR;
 
 /* Provider attributes */
@@ -1096,7 +1096,7 @@
 	DAT_BOOLEAN dto_async_return_guaranteed;
 	DAT_BOOLEAN rdma_write_for_rdma_read_req;
 	DAT_COUNT num_provider_specific_attr;
-	DAT_NAMED_ATTR *provider_specific_attr;
+	struct dat_named_attr *provider_specific_attr;
 };
 
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel4/dat-provider/dapl_adapter_util.h linux-kernel5/dat-provider/dapl_adapter_util.h
--- linux-kernel4/dat-provider/dapl_adapter_util.h	2005-05-06 16:22:02.936005000 -0700
+++ linux-kernel5/dat-provider/dapl_adapter_util.h	2005-05-09 11:56:04.963050000 -0700
@@ -178,7 +178,7 @@
 
 
 /*
- * Values for provider DAT_NAMED_ATTR
+ * Values for provider struct dat_named_attr
  */
 #define IB_QP_STATE		1	/* QP state change request */
 
diff -Nur -X /home/tduffy/dontdiff linux-kernel4/dat-provider/dapl_ia_util.c linux-kernel5/dat-provider/dapl_ia_util.c
--- linux-kernel4/dat-provider/dapl_ia_util.c	2005-05-09 11:07:01.789010000 -0700
+++ linux-kernel5/dat-provider/dapl_ia_util.c	2005-05-09 11:56:04.969021000 -0700
@@ -191,7 +191,7 @@
 		/* force the EP into error state to force flush all posted DTOs. */
 		{
 			DAT_EP_ATTR ep_attr;
-			DAT_NAMED_ATTR ep_state;
+			struct dat_named_attr ep_state;
 
 			memset(&ep_attr, 0, sizeof(DAT_EP_ATTR));
 			ep_state.name = (char *)IB_QP_STATE;
diff -Nur -X /home/tduffy/dontdiff linux-kernel4/dat-provider/dapl_openib_util.c linux-kernel5/dat-provider/dapl_openib_util.c
--- linux-kernel4/dat-provider/dapl_openib_util.c	2005-05-04 08:19:32.732990000 -0700
+++ linux-kernel5/dat-provider/dapl_openib_util.c	2005-05-09 11:58:35.028003000 -0700
@@ -799,11 +799,10 @@
 		 *
 		 * Assign transport specific and vendor specific values here.
 		 * Both attributes are of type:
-		 *    typedef struct dat_named_attr
-		 *    {
-		 *              const char *    name;      * Name of attribute  *
-		 *              const char *    value;     * Value of attribute *
-		 *    } DAT_NAMED_ATTR;
+		 *    struct dat_named_attr {
+		 *              const char *name;     * Name of attribute  *
+		 *              const char *value;    * Value of attribute *
+		 *    };
 		 */
 		ia_attr->num_transport_attr = 0;
 		ia_attr->transport_attr = NULL;