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 <ajaykumar.hotchandani@oracle.com>
Signed-off-by: Wei Lin Guay <wei.lin.guay@oracle.com>
Reviewed-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 0c59a80929c641905238be0c507346db768a5db6..46c7659bf69a9fe9ec1991bb80cb75504274f607 100644 (file)
--- 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 ee2e468a9a74340a3e26149dabb73b7441adb4ee..5708337151bf203cd38f505c6f1263990213f682 100644 (file)
--- 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);