Also, cosmetic formatting changes
Signed-off-by: Hal Rosenstock <[email protected]>
---
diff --git a/libibmad/src/sa.c b/libibmad/src/sa.c
index 5174bb5..60c803f 100644
--- a/libibmad/src/sa.c
+++ b/libibmad/src/sa.c
@@ -45,8 +45,8 @@
#undef DEBUG
#define DEBUG if (ibdebug) IBWARN
-uint8_t *sa_rpc_call(const struct ibmad_port *ibmad_port, void *rcvbuf,
ib_portid_t * portid,
- ib_sa_call_t * sa, unsigned timeout)
+uint8_t *sa_rpc_call(const struct ibmad_port *ibmad_port, void *rcvbuf,
+ ib_portid_t * portid, ib_sa_call_t * sa, unsigned timeout)
{
ib_rpc_t rpc = { 0 };
uint8_t *p;
@@ -73,7 +73,7 @@ uint8_t *sa_rpc_call(const struct ibmad_port *ibmad_port,
void *rcvbuf, ib_porti
if (!portid->qkey)
portid->qkey = IB_DEFAULT_QP1_QKEY;
- p = mad_rpc_rmpp(ibmad_port, &rpc, portid, 0 /*&sa->rmpp */ , rcvbuf);
/* TODO: RMPP */
+ p = mad_rpc_rmpp(ibmad_port, &rpc, portid, 0 /*&sa->rmpp */, rcvbuf);
/* TODO: RMPP */
sa->recsz = rpc.recsz;
@@ -110,8 +110,7 @@ uint8_t *sa_call(void *rcvbuf, ib_portid_t * portid,
ib_sa_call_t * sa,
#define IB_PR_COMPMASK_PREFERENCE (1ull<<22)
#define IB_PR_DEF_MASK (IB_PR_COMPMASK_DGID |\
- IB_PR_COMPMASK_SGID |\
- IB_PR_COMPMASK_NUMBPATH)
+ IB_PR_COMPMASK_SGID)
int ib_path_query_via(const struct ibmad_port *srcport, ibmad_gid_t srcgid,
ibmad_gid_t destgid, ib_portid_t * sm_id, void *buf)
@@ -130,7 +129,6 @@ int ib_path_query_via(const struct ibmad_port *srcport,
ibmad_gid_t srcgid,
memset(buf, 0, IB_SA_PR_RECSZ);
- mad_encode_field(buf, IB_SA_PR_NPATH_F, &npath);
mad_encode_field(buf, IB_SA_PR_DGID_F, destgid);
mad_encode_field(buf, IB_SA_PR_SGID_F, srcgid);
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
