From beb7fad400216d9ac7489851bb6adef0ded43454 Mon Sep 17 00:00:00 2001 From: Hoang-Nam Nguyen Date: Fri, 10 Oct 2008 14:40:39 -0700 Subject: [PATCH] --- yaml --- r: 116837 b: refs/heads/master c: 0540bbbe455e123a1692d26205ad1a29983883b0 h: refs/heads/master i: 116835: b730b026f370753bb681bc06eec70aad4b7707d8 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 - trunk/drivers/infiniband/hw/ehca/ehca_qp.c | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2430ca68aa7f..9c6ebde6d28f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc35fac9e936c6cc6ad825fc7e4455468d10adc6 +refs/heads/master: 0540bbbe455e123a1692d26205ad1a29983883b0 diff --git a/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c b/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c index 44e936e48a31..c325c44807e8 100644 --- a/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c @@ -1942,7 +1942,6 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) fail3: cxgb3_free_atid(ep->com.tdev, ep->atid); fail2: - cm_id->rem_ref(cm_id); put_ep(&ep->com); out: return err; diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_qp.c b/trunk/drivers/infiniband/hw/ehca/ehca_qp.c index 4dbe2870e014..40b578d601c5 100644 --- a/trunk/drivers/infiniband/hw/ehca/ehca_qp.c +++ b/trunk/drivers/infiniband/hw/ehca/ehca_qp.c @@ -502,6 +502,12 @@ static struct ehca_qp *internal_create_qp( if (init_attr->srq) { my_srq = container_of(init_attr->srq, struct ehca_qp, ib_srq); + if (qp_type == IB_QPT_UC) { + ehca_err(pd->device, "UC with SRQ not supported"); + atomic_dec(&shca->num_qps); + return ERR_PTR(-EINVAL); + } + has_srq = 1; parms.ext_type = EQPT_SRQBASE; parms.srq_qpn = my_srq->real_qp_num;