From b0c563824b40240b223721ad0658e79946df27cc Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 2 Aug 2009 22:57:01 +0100 Subject: [infiniband] Change IB_{QPN,QKEY,QPT} names from {SMA,GMA} to {SMI,GSI} The IBA specification refers to management "interfaces" and "agents". The interface is the component that connects to the queue pair and sends and receives MADs; the agent is the component that constructs the reply to the MAD. Rename the IB_{QPN,QKEY,QPT} constants as a first step towards making this separation in gPXE. --- src/net/infiniband/ib_gma.c | 6 +++--- src/net/infiniband/ib_packet.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/net/infiniband') diff --git a/src/net/infiniband/ib_gma.c b/src/net/infiniband/ib_gma.c index 174b8845a..1a87b26a9 100644 --- a/src/net/infiniband/ib_gma.c +++ b/src/net/infiniband/ib_gma.c @@ -590,8 +590,8 @@ int ib_gma_request ( struct ib_gma *gma, union ib_mad *mad, } else { request->av.lid = ibdev->sm_lid; request->av.sl = ibdev->sm_sl; - request->av.qpn = IB_QPN_GMA; - request->av.qkey = IB_QKEY_GMA; + request->av.qpn = IB_QPN_GSI; + request->av.qkey = IB_QKEY_GSI; } /* Copy MAD body */ @@ -656,7 +656,7 @@ struct ib_gma * ib_create_gma ( struct ib_device *ibdev, DBGC ( gma, "GMA %p running on QPN %#lx\n", gma, gma->qp->qpn ); /* Set queue key */ - gma->qp->qkey = ( ( type == IB_QPT_SMA ) ? IB_QKEY_SMA : IB_QKEY_GMA ); + gma->qp->qkey = ( ( type == IB_QPT_SMI ) ? IB_QKEY_SMI : IB_QKEY_GSI ); if ( ( rc = ib_modify_qp ( ibdev, gma->qp ) ) != 0 ) { DBGC ( gma, "GMA %p could not set queue key: %s\n", gma, strerror ( rc ) ); diff --git a/src/net/infiniband/ib_packet.c b/src/net/infiniband/ib_packet.c index 42ff3499c..08820ef36 100644 --- a/src/net/infiniband/ib_packet.c +++ b/src/net/infiniband/ib_packet.c @@ -76,7 +76,7 @@ int ib_push ( struct ib_device *ibdev, struct io_buffer *iobuf, lrh_len = ( payload_len + iob_len ( iobuf ) - orig_iob_len ); /* Construct LRH */ - vl = ( ( qp->ext_qpn == IB_QPN_SMA ) ? IB_VL_SMP : IB_VL_DEFAULT ); + vl = ( ( qp->ext_qpn == IB_QPN_SMI ) ? IB_VL_SMP : IB_VL_DEFAULT ); lrh->vl__lver = ( vl << 4 ); lnh = ( grh ? IB_LNH_GRH : IB_LNH_BTH ); lrh->sl__lnh = ( ( av->sl << 4 ) | lnh ); -- cgit v1.2.3-55-g7522