From 58b6794c111d8a8984d50bae10f720561c5c07f7 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 13 Nov 2009 19:02:04 +0000
Subject: [PATCH] [infiniband] Rename IB_PKEY_NONE to IB_PKEY_DEFAULT

There is no such thing as a non-existent partition.
---
 src/include/gpxe/infiniband.h | 2 +-
 src/net/infiniband.c          | 2 +-
 src/net/infiniband/ib_srp.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/include/gpxe/infiniband.h b/src/include/gpxe/infiniband.h
index fd2a433d..a12e4036 100644
--- a/src/include/gpxe/infiniband.h
+++ b/src/include/gpxe/infiniband.h
@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define IB_QPN_BROADCAST 0xffffffUL
 
 /** Default Infiniband partition key */
-#define IB_PKEY_NONE 0xffff
+#define IB_PKEY_DEFAULT 0xffff
 
 /**
  * Maximum payload size
diff --git a/src/net/infiniband.c b/src/net/infiniband.c
index 0025e5c4..d7813249 100644
--- a/src/net/infiniband.c
+++ b/src/net/infiniband.c
@@ -867,7 +867,7 @@ struct ib_device * alloc_ibdev ( size_t priv_size ) {
 		INIT_LIST_HEAD ( &ibdev->qps );
 		ibdev->port_state = IB_PORT_STATE_DOWN;
 		ibdev->lid = IB_LID_NONE;
-		ibdev->pkey = IB_PKEY_NONE;
+		ibdev->pkey = IB_PKEY_DEFAULT;
 	}
 	return ibdev;
 }
diff --git a/src/net/infiniband/ib_srp.c b/src/net/infiniband/ib_srp.c
index 4191c869..c156d3ae 100644
--- a/src/net/infiniband/ib_srp.c
+++ b/src/net/infiniband/ib_srp.c
@@ -218,7 +218,7 @@ static int ib_srp_parse_pkey ( const char *rp_comp,
 			       struct ib_srp_root_path *rp ) {
 	int pkey;
 
-	if ( ( pkey = ib_srp_parse_integer ( rp_comp, IB_PKEY_NONE ) ) < 0 )
+	if ( ( pkey = ib_srp_parse_integer ( rp_comp, IB_PKEY_DEFAULT ) ) < 0 )
 		return pkey;
 	rp->ib->pkey = pkey;
 	return 0;