From 1b3dad1578536b8b5d3fa6db281ea6dfde54eeaa Mon Sep 17 00:00:00 2001 From: Mike Marciniszyn Date: Mon, 23 Jul 2012 16:38:15 +0000 Subject: [PATCH] --- yaml --- r: 320709 b: refs/heads/master c: 5d7fe4efbf0878e0ef12c8f93e7a16c750494b7e h: refs/heads/master i: 320707: dfdc6d3359932414507b69a35c91475f54c26559 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +--- trunk/drivers/infiniband/hw/qib/qib.h | 10 +++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c165131d43d7..7d19ce4ddd08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e8fa040cb2d9070d15d3f0d71b83e85e32ecde2 +refs/heads/master: 5d7fe4efbf0878e0ef12c8f93e7a16c750494b7e diff --git a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index cb5b7f7d4d38..b2f9784beb4a 100644 --- a/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/trunk/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -893,9 +893,7 @@ static int ocrdma_check_qp_params(struct ib_pd *ibpd, struct ocrdma_dev *dev, /* verify consumer QPs are not trying to use GSI QP's CQ */ if ((attrs->qp_type != IB_QPT_GSI) && (dev->gsi_qp_created)) { if ((dev->gsi_sqcq == get_ocrdma_cq(attrs->send_cq)) || - (dev->gsi_sqcq == get_ocrdma_cq(attrs->recv_cq)) || - (dev->gsi_rqcq == get_ocrdma_cq(attrs->send_cq)) || - (dev->gsi_rqcq == get_ocrdma_cq(attrs->recv_cq))) { + (dev->gsi_sqcq == get_ocrdma_cq(attrs->send_cq))) { ocrdma_err("%s(%d) Consumer QP cannot use GSI CQs.\n", __func__, dev->id); return -EINVAL; diff --git a/trunk/drivers/infiniband/hw/qib/qib.h b/trunk/drivers/infiniband/hw/qib/qib.h index 6e19ec844d99..7b1b86690024 100644 --- a/trunk/drivers/infiniband/hw/qib/qib.h +++ b/trunk/drivers/infiniband/hw/qib/qib.h @@ -656,6 +656,11 @@ struct qib_pportdata { /* 16 congestion entries with each entry corresponding to a SL */ struct ib_cc_congestion_entry_shadow *congestion_entries; + /* Maximum number of congestion control entries that the agent expects + * the manager to send. + */ + u16 cc_supported_table_entries; + /* Total number of congestion control table entries */ u16 total_cct_entry; @@ -667,11 +672,6 @@ struct qib_pportdata { /* CA's max number of 64 entry units in the congestion control table */ u8 cc_max_table_entries; - - /* Maximum number of congestion control entries that the agent expects - * the manager to send. - */ - u8 cc_supported_table_entries; }; /* Observers. Not to be taken lightly, possibly not to ship. */