On Wed, 27 Apr 2011 04:14:36 -0700 Hal Rosenstock <[email protected]> wrote:
> > according to rpc error field > > Signed-off-by: Hal Rosenstock <[email protected]> Thanks applied, Ira > --- > diff --git a/src/gs.c b/src/gs.c > index 3cb2b25..5541b6b 100644 > --- a/src/gs.c > +++ b/src/gs.c > @@ -1,5 +1,6 @@ > /* > * Copyright (c) 2004-2009 Voltaire Inc. All rights reserved. > + * Copyright (c) 2011 Mellanox Technologies LTD. All rights reserved. > * > * This software is available to you under a choice of one of two > * licenses. You may choose to be licensed under the terms of the GNU > @@ -38,6 +39,7 @@ > #include <stdio.h> > #include <stdlib.h> > #include <string.h> > +#include <errno.h> > > #include <infiniband/umad.h> > #include <infiniband/mad.h> > @@ -49,8 +51,10 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, > int port, > unsigned timeout, unsigned id, > const struct ibmad_port * srcport) > { > - ib_rpc_t rpc = { 0 }; > + ib_rpc_v1_t rpc = { 0 }; > + ib_rpc_t *rpcold = (ib_rpc_t *)(void *)&rpc; > int lid = dest->lid; > + void *p_ret; > > DEBUG("lid %u port %d", lid, port); > > @@ -59,7 +63,7 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, > int port, > return NULL; > } > > - rpc.mgtclass = IB_PERFORMANCE_CLASS; > + rpc.mgtclass = IB_PERFORMANCE_CLASS | IB_MAD_RPC_VERSION1; > rpc.method = IB_MAD_METHOD_GET; > rpc.attr.id = id; > > @@ -75,15 +79,20 @@ uint8_t *pma_query_via(void *rcvbuf, ib_portid_t * dest, > int port, > if (!dest->qkey) > dest->qkey = IB_DEFAULT_QP1_QKEY; > > - return mad_rpc(srcport, &rpc, dest, rcvbuf, rcvbuf); > + p_ret = mad_rpc(srcport, rpcold, dest, rcvbuf, rcvbuf); > + errno = rpc.error; > + return p_ret; > } > > uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * dest, > int port, unsigned mask, unsigned timeout, > unsigned id, const struct ibmad_port * srcport) > { > - ib_rpc_t rpc = { 0 }; > + ib_rpc_v1_t rpc = { 0 }; > + ib_rpc_t *rpcold = (ib_rpc_t *)(void *)&rpc; > + > int lid = dest->lid; > + void *p_ret; > > DEBUG("lid %u port %d mask 0x%x", lid, port, mask); > > @@ -95,7 +104,7 @@ uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t * > dest, > if (!mask) > mask = ~0; > > - rpc.mgtclass = IB_PERFORMANCE_CLASS; > + rpc.mgtclass = IB_PERFORMANCE_CLASS | IB_MAD_RPC_VERSION1; > rpc.method = IB_MAD_METHOD_SET; > rpc.attr.id = id; > > @@ -115,5 +124,7 @@ uint8_t *performance_reset_via(void *rcvbuf, ib_portid_t > * dest, > if (!dest->qkey) > dest->qkey = IB_DEFAULT_QP1_QKEY; > > - return mad_rpc(srcport, &rpc, dest, rcvbuf, rcvbuf); > + p_ret = mad_rpc(srcport, rpcold, dest, rcvbuf, rcvbuf); > + errno = rpc.error; > + return p_ret; > } -- Ira Weiny Math Programmer/Computer Scientist Lawrence Livermore National Lab 925-423-8008 [email protected] -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
