From b05d7a3d6819b9e65ddb4b1d0f3dc9d9caf39c47 Mon Sep 17 00:00:00 2001
From: Hoang-Nam Nguyen <hnguyen at de.ibm.com>
Date: Thu, 17 Jan 2008 15:04:32 +0100
Subject: [PATCH] --- yaml --- r: 76847 b: refs/heads/master c:
 b8b50e353b85bc3c791dd2b99370ac300ebcd186 h: refs/heads/master i:   76845:
 0a94a916b22650793ba08a79d0d07f0c74e69fc9   76843:
 cc982c0ebb9b519fe244b5da8d5ed03d65230209   76839:
 aa010206201e38422affd3f76a63fd3c5daf7142   76831:
 1c358d1cfca14baca57d4c53a202ec58db77cba6 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/infiniband/hw/ehca/ehca_classes.h | 2 +-
 trunk/drivers/infiniband/hw/ehca/ehca_main.c    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7db99a4416ec..3a457de7a62b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c86e280fe8a08d4ae30b77e46a1e7da28d756c9
+refs/heads/master: b8b50e353b85bc3c791dd2b99370ac300ebcd186
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_classes.h b/trunk/drivers/infiniband/hw/ehca/ehca_classes.h
index 74d2b72a11d8..936580d86ad3 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -94,7 +94,7 @@ struct ehca_sma_attr {
 
 struct ehca_sport {
 	struct ib_cq *ibcq_aqp1;
-	struct ib_qp *ibqp_aqp1;
+	struct ib_qp *ibqp_sqp[2];
 	enum ib_port_state port_state;
 	struct ehca_sma_attr saved_attr;
 };
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_main.c b/trunk/drivers/infiniband/hw/ehca/ehca_main.c
index 173d3e9f9268..0a34083dac8a 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_main.c
@@ -511,7 +511,7 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port)
 	}
 	sport->ibcq_aqp1 = ibcq;
 
-	if (sport->ibqp_aqp1) {
+	if (sport->ibqp_sqp[IB_QPT_GSI]) {
 		ehca_err(&shca->ib_device, "AQP1 QP is already created.");
 		ret = -EPERM;
 		goto create_aqp1;
@@ -537,7 +537,7 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port)
 		ret = PTR_ERR(ibqp);
 		goto create_aqp1;
 	}
-	sport->ibqp_aqp1 = ibqp;
+	sport->ibqp_sqp[IB_QPT_GSI] = ibqp;
 
 	return 0;
 
@@ -550,7 +550,7 @@ static int ehca_destroy_aqp1(struct ehca_sport *sport)
 {
 	int ret;
 
-	ret = ib_destroy_qp(sport->ibqp_aqp1);
+	ret = ib_destroy_qp(sport->ibqp_sqp[IB_QPT_GSI]);
 	if (ret) {
 		ehca_gen_err("Cannot destroy AQP1 QP. ret=%i", ret);
 		return ret;