From: Hariprasad S Date: Tue, 8 Sep 2015 04:26:59 +0000 (+0530) Subject: iw_cxgb4: fix misuse of ep->ord for minimum ird calculation X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f57b780c0000a56b5e51df5f94a35828bb5e6a7a;p=openwrt%2Fstaging%2Fblogic.git iw_cxgb4: fix misuse of ep->ord for minimum ird calculation When calculating the minimum ird in c4iw_accept_cr(), we need to always have a value of at least 1 if the RTR message is a 0B read. The code was incorrectly using ep->ord for this logic which was incorrectly adjusting the ird and causing incorrect ord/ird negotiation when using MPAv2 to negotiate these values. Signed-off-by: Hariprasad Shenai Signed-off-by: Doug Ledford --- diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index a6aae913850c..fa3ee5971f35 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -2933,7 +2933,7 @@ int c4iw_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) } else { if (peer2peer && (ep->mpa_attr.p2p_type != FW_RI_INIT_P2PTYPE_DISABLED) && - (p2p_type == FW_RI_INIT_P2PTYPE_READ_REQ) && ep->ord == 0) + (p2p_type == FW_RI_INIT_P2PTYPE_READ_REQ) && ep->ird == 0) ep->ird = 1; }