Skip to contentSkip to conversation

IB/ehca: Fix static rate regression

PATCH Applied Joachim Fenkes 2 participants 2 messages Nov 22, 2007 – Nov 24, 2007 InfiniBand

lore
Share & tools
lore

Joachim Fenkes

author
#0 lore raw

PATCH 1/1 IB/ehca: Fix static rate regression

Wrong choice of port number caused modify_qp() to fail -- fixed.

Signed-off-by Joachim Fenkes <[email protected]>

---
Please apply this for 2.6.24-rc4 as it fixes a regression introduced in rc3. Thanks!

 drivers/infiniband/hw/ehca/ehca_qp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/ehca/ehca_qp.c +2 -2
index 2e3e654..dd12668 100644
@@ -1203,7 +1203,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
 		mqpcb->service_level = attr->ah_attr.sl;
 		update_mask |= EHCA_BMASK_SET(MQPCB_MASK_SERVICE_LEVEL, 1);
 
-		if (ehca_calc_ipd(shca, my_qp->init_attr.port_num,
+		if (ehca_calc_ipd(shca, mqpcb->prim_phys_port,
 				  attr->ah_attr.static_rate,
 				  &mqpcb->max_static_rate)) {
 			ret = -EINVAL;

@@ -1302,7 +1302,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
 		mqpcb->source_path_bits_al = attr->alt_ah_attr.src_path_bits;
 		mqpcb->service_level_al = attr->alt_ah_attr.sl;
 
-		if (ehca_calc_ipd(shca, my_qp->init_attr.port_num,
+		if (ehca_calc_ipd(shca, mqpcb->alt_phys_port,
 				  attr->alt_ah_attr.static_rate,
 				  &mqpcb->max_static_rate_al)) {
 			ret = -EINVAL;
Signature · 1 line
1.5.2