From ab191e45dbfe13c5bd2c7f6415c520e8d60ad850 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 17 Sep 2007 10:39:30 +0100
Subject: Unicasts seem to be working. :)

---
 src/include/gpxe/infiniband.h | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/include/gpxe')

diff --git a/src/include/gpxe/infiniband.h b/src/include/gpxe/infiniband.h
index 2d1d94338..845c4c228 100644
--- a/src/include/gpxe/infiniband.h
+++ b/src/include/gpxe/infiniband.h
@@ -14,11 +14,14 @@
 #define IB_SA_QPN	1
 
 /** Subnet administrator queue key */
-#define IB_SA_QKEY	0x80010000UL
+#define IB_GLOBAL_QKEY	0x80010000UL
 
 /** An Infiniband Global Identifier */
 struct ib_gid {
-	uint8_t bytes[16];
+	union {
+		uint8_t bytes[16];
+		uint32_t dwords[4];
+	} u;
 };
 
 /** An Infiniband Global Route Header */
@@ -136,7 +139,7 @@ struct ib_address_vector {
 	/** Destination Queue Pair */
 	unsigned int dest_qp;
 	/** Queue key */
-	unsigned int qkey;
+	unsigned long qkey;
 	/** Destination Local ID */
 	unsigned int dlid;
 	/** Rate */
@@ -530,9 +533,12 @@ struct ib_mad_path_record {
 	uint16_t slid;
 	uint32_t hop_limit__flow_label__raw_traffic;
 	uint32_t pkey__numb_path__reversible__tclass;
-	uint32_t rate__rate_selector__mtu__mtu_selector__sl__reserved;
+	uint8_t reserved1;
+	uint8_t reserved__sl;
+	uint8_t mtu_selector__mtu;
+	uint8_t rate_selector__rate;
 	uint32_t preference__packet_lifetime__packet_lifetime_selector;
-	uint32_t reserved1[35];
+	uint32_t reserved2[35];
 } __attribute__ (( packed ));
 
 union ib_mad {
-- 
cgit v1.2.3-55-g7522