From e7a9b232e01e39c15845d5079e9ec626e1dfc983 Mon Sep 17 00:00:00 2001 From: Wei Lin Guay Date: Tue, 12 Sep 2017 22:05:20 +0200 Subject: [PATCH] Revert "RDMA CM: Add reason code for IB_CM_REJ_CONSUMER_DEFINED" This revert commit 5e86bae96237 ("RDMA CM: Add reason code for IB_CM_REJ_CONSUMER_DEFINED". because rolling downgrade has been de-featured. Thus, the underlying rdma_cm/ib_cm changes can be removed. Orabug: 26124147 Suggested-by: Ajaykumar Hotchandani Signed-off-by: Wei Lin Guay Reviewed-by: Ajaykumar Hotchandani --- drivers/infiniband/core/cm.c | 8 ++------ drivers/infiniband/core/cma.c | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 0c59a80929c6..46c7659bf69a 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1161,10 +1161,8 @@ retest: spin_unlock_irq(&cm_id_priv->lock); } else { spin_unlock_irq(&cm_id_priv->lock); - if (!err) - err = -EINVAL; ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED, - NULL, 0, &err, sizeof(err)); + NULL, 0, NULL, 0); } break; case IB_CM_REP_SENT: @@ -1175,10 +1173,8 @@ retest: case IB_CM_REP_RCVD: case IB_CM_MRA_REP_SENT: spin_unlock_irq(&cm_id_priv->lock); - if (!err) - err = -EINVAL; ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED, - NULL, 0, &err, sizeof(err)); + NULL, 0, NULL, 0); break; case IB_CM_ESTABLISHED: spin_unlock_irq(&cm_id_priv->lock); diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index ee2e468a9a74..5708337151bf 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -1081,7 +1081,7 @@ reject: cma_modify_qp_err(id_priv); cma_dbg(id_priv, "sending REJ\n"); ib_send_cm_rej(id_priv->cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED, - NULL, 0, &ret, sizeof(int)); + NULL, 0, NULL, 0); return ret; } @@ -3135,7 +3135,7 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param) return 0; reject: cma_modify_qp_err(id_priv); - rdma_reject(id, &ret, sizeof(int)); + rdma_reject(id, NULL, 0); return ret; } EXPORT_SYMBOL(rdma_accept); -- 2.50.1