From eafb237aa4e66de6b6d05e1dfd8da32fb85e282a Mon Sep 17 00:00:00 2001
From: Joachim Fenkes <fenkes@de.ibm.com>
Date: Tue, 16 Oct 2007 17:24:07 +0200
Subject: [PATCH] --- yaml --- r: 72284 b: refs/heads/master c:
 c0c84d566ddc8dbdd3ceab23865a688c36217338 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/infiniband/hw/ehca/ehca_qp.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e584bd2bd90..3b7a08a4f629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69fc507a1424ce31d2096be5b1e5b1750bdfe235
+refs/heads/master: c0c84d566ddc8dbdd3ceab23865a688c36217338
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_qp.c b/trunk/drivers/infiniband/hw/ehca/ehca_qp.c
index e2bd62be11e7..de182648b282 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -451,7 +451,6 @@ static struct ehca_qp *internal_create_qp(
 		has_srq = 1;
 		parms.ext_type = EQPT_SRQBASE;
 		parms.srq_qpn = my_srq->real_qp_num;
-		parms.srq_token = my_srq->token;
 	}
 
 	if (is_llqp && has_srq) {
@@ -583,6 +582,9 @@ static struct ehca_qp *internal_create_qp(
 		goto create_qp_exit1;
 	}
 
+	if (has_srq)
+		parms.srq_token = my_qp->token;
+
 	parms.servicetype = ibqptype2servicetype(qp_type);
 	if (parms.servicetype < 0) {
 		ret = -EINVAL;