diff options
| author | Michael Brown | 2009-08-02 23:57:01 +0200 |
|---|---|---|
| committer | Michael Brown | 2009-08-06 02:24:18 +0200 |
| commit | b0c563824b40240b223721ad0658e79946df27cc (patch) | |
| tree | a375ff568ff3a6431ff1960faa9f67f7085440e2 /src/net | |
| parent | [build] Mark __intel_new_proc_init with __libgcc rather than cdecl (diff) | |
| download | ipxe-b0c563824b40240b223721ad0658e79946df27cc.tar.gz ipxe-b0c563824b40240b223721ad0658e79946df27cc.tar.xz ipxe-b0c563824b40240b223721ad0658e79946df27cc.zip | |
[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.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/infiniband.c | 12 | ||||
| -rw-r--r-- | src/net/infiniband/ib_gma.c | 6 | ||||
| -rw-r--r-- | src/net/infiniband/ib_packet.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/net/infiniband.c b/src/net/infiniband.c index 96a663c88..167708164 100644 --- a/src/net/infiniband.c +++ b/src/net/infiniband.c @@ -209,11 +209,11 @@ struct ib_queue_pair * ib_create_qp ( struct ib_device *ibdev, /* Calculate externally-visible QPN */ switch ( type ) { - case IB_QPT_SMA: - qp->ext_qpn = IB_QPN_SMA; + case IB_QPT_SMI: + qp->ext_qpn = IB_QPN_SMI; break; - case IB_QPT_GMA: - qp->ext_qpn = IB_QPN_GMA; + case IB_QPT_GSI: + qp->ext_qpn = IB_QPN_GSI; break; default: qp->ext_qpn = qp->qpn; @@ -535,7 +535,7 @@ int ib_open ( struct ib_device *ibdev ) { } /* Create subnet management agent */ - ibdev->sma = ib_create_gma ( ibdev, IB_QPT_SMA ); + ibdev->sma = ib_create_gma ( ibdev, IB_QPT_SMI ); if ( ! ibdev->sma ) { DBGC ( ibdev, "IBDEV %p could not create SMA\n", ibdev ); rc = -ENOMEM; @@ -543,7 +543,7 @@ int ib_open ( struct ib_device *ibdev ) { } /* Create general management agent */ - ibdev->gma = ib_create_gma ( ibdev, IB_QPT_GMA ); + ibdev->gma = ib_create_gma ( ibdev, IB_QPT_GSI ); if ( ! ibdev->gma ) { DBGC ( ibdev, "IBDEV %p could not create GMA\n", ibdev ); rc = -ENOMEM; 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 ); |