summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2009-11-13 20:02:04 +0100
committerMichael Brown2009-11-16 23:14:36 +0100
commit58b6794c111d8a8984d50bae10f720561c5c07f7 (patch)
tree1b50001294f8dfa334e28f323bf8721a9317e656
parent[infiniband] Report IB link status as IPoIB netdevice status (diff)
downloadipxe-58b6794c111d8a8984d50bae10f720561c5c07f7.tar.gz
ipxe-58b6794c111d8a8984d50bae10f720561c5c07f7.tar.xz
ipxe-58b6794c111d8a8984d50bae10f720561c5c07f7.zip
[infiniband] Rename IB_PKEY_NONE to IB_PKEY_DEFAULT
There is no such thing as a non-existent partition.
-rw-r--r--src/include/gpxe/infiniband.h2
-rw-r--r--src/net/infiniband.c2
-rw-r--r--src/net/infiniband/ib_srp.c2
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;