[ofw] [RFC] [PATCH] ibal: move transport type attribute

Sean Hefty sean.hefty at intel.com
Fri Mar 5 14:10:55 PST 2010


Relocate the transport type enum into space currently
reserved by the compiler to avoid binary compatibility issues.
Also define the enum that the port attributes refer to.

Signed-off-by: Sean Hefty <sean.hefty at intel.com>
---
This is not related to the 2.2 release.

I'm guessing that the compiler reserved 48 bits of space between
the mtu and max_msg_size fields, but didn't actually confirm this
yet.

 trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h |    6 ------
 trunk/inc/iba/ib_types.h                |    9 +++++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h b/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h
index c8bd01b..44590df 100644
--- a/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h
+++ b/trunk/hw/mlx4/kernel/bus/inc/ib_verbs.h
@@ -89,12 +89,6 @@ enum rdma_node_type {
 	RDMA_NODE_RNIC
 };
 
-enum rdma_transport_type {
-	RDMA_TRANSPORT_IB,
-	RDMA_TRANSPORT_IWARP,
-	RDMA_TRANSPORT_RDMAOE
-};
-
 enum rdma_transport_type
 rdma_node_get_transport(enum rdma_node_type node_type) __attribute_const__;
 
diff --git a/trunk/inc/iba/ib_types.h b/trunk/inc/iba/ib_types.h
index 4f942ff..56a7b40 100644
--- a/trunk/inc/iba/ib_types.h
+++ b/trunk/inc/iba/ib_types.h
@@ -9366,6 +9366,12 @@ typedef struct _ib_port_attr_mod
 *	ib_port_cap_t
 *****/
 
+enum rdma_transport_type {
+	RDMA_TRANSPORT_IB,
+	RDMA_TRANSPORT_IWARP,
+	RDMA_TRANSPORT_RDMAOE
+};
+
 /****s* Access Layer/ib_port_attr_t
 * NAME
 *	ib_port_attr_t
@@ -9380,6 +9386,7 @@ typedef struct _ib_port_attr
 	ib_net64_t				port_guid;
 	uint8_t					port_num;
 	uint8_t					mtu;
+	enum rdma_transport_type	transport;
 	uint64_t				max_msg_size;
 	ib_net16_t				lid;
 	uint8_t					lmc;
@@ -9419,8 +9426,6 @@ typedef struct _ib_port_attr
 	TO_LONG_PTR(ib_gid_t*,	p_gid_table);
 	TO_LONG_PTR(ib_net16_t*,p_pkey_table);
 
-	enum rdma_transport_type	transport;
-
 }	ib_port_attr_t;
 /*
 * SEE ALSO





More information about the ofw mailing list