On Wed, 13 Feb 2013 18:14:31 -0500 Hal Rosenstock <[email protected]> wrote:
> On 2/13/2013 5:23 PM, Ira Weiny wrote: > > We should update the man page for saquery to reflect this change in the > > same patch. > > The man page is far behind the help in saquery so I didn't think it was > worth it without a complete redo of the man page. I disagree, I redid the man pages in rst and at that time synced them up. I may have missed something but it is not far behind. Ira > > -- Hal > > > > > Thanks, > > Ira > > > > On Wed, 13 Feb 2013 08:31:41 -0500 > > Hal Rosenstock <[email protected]> wrote: > > > >> > >> Signed-off-by: Hal Rosenstock <[email protected]> > >> --- > >> diff --git a/src/saquery.c b/src/saquery.c > >> index bdf5e9a..1994cf9 100644 > >> --- a/src/saquery.c > >> +++ b/src/saquery.c > >> @@ -59,7 +59,13 @@ > >> > >> #include "ibdiag_common.h" > >> > >> +#ifndef IB_PR_COMPMASK_SERVICEID > >> +#define IB_PR_COMPMASK_SERVICEID (IB_PR_COMPMASK_SERVICEID_MSB | \ > >> + IB_PR_COMPMASK_SERVICEID_LSB) > >> +#endif > >> + > >> struct query_params { > >> + uint64_t service_id; > >> ib_gid_t sgid, dgid, gid, mgid; > >> uint16_t slid, dlid, mlid; > >> uint32_t flow_label; > >> @@ -959,6 +965,7 @@ static int query_path_records(const struct query_cmd > >> *q, bind_handle_t h, > >> uint8_t reversible = 0; > >> > >> memset(&pr, 0, sizeof(pr)); > >> + CHECK_AND_SET_VAL(p->service_id, 64, 0, pr.service_id, PR, SERVICEID); > >> CHECK_AND_SET_GID(p->sgid, pr.sgid, PR, SGID); > >> CHECK_AND_SET_GID(p->dgid, pr.dgid, PR, DGID); > >> CHECK_AND_SET_VAL(p->slid, 16, 0, pr.slid, PR, SLID); > >> @@ -1518,6 +1525,9 @@ static int process_opt(void *context, int ch, char > >> *optarg) > >> case 'X': > >> p->proxy_join = strtoul(optarg, NULL, 0); > >> break; > >> + case 22: > >> + p->service_id = strtoull(optarg, NULL, 0); > >> + break; > >> default: > >> return -1; > >> } > >> @@ -1596,6 +1606,7 @@ int main(int argc, char **argv) > >> {"hop_limit", 'H', 1, NULL, > >> "Hop limit (PathRecord, MCMemberRecord)"}, > >> {"scope", 21, 1, NULL, "Scope (MCMemberRecord)"}, > >> + {"service_id", 22, 1, NULL, "ServiceID (PathRecord)"}, > >> {"join_state", 'J', 1, NULL, "Join state (MCMemberRecord)"}, > >> {"proxy_join", 'X', 1, NULL, "Proxy join (MCMemberRecord)"}, > >> {0} > >> -- > >> 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 > > > > > > -- > 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 -- Ira Weiny Member of Technical Staff 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
