1 files changed, 11 insertions, 5 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 02110e00d14..3a611fe5497 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -308,10 +308,11 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
 {
         unsigned long flags;
         int ret;
+        static int next_id;
 
         do {
                 spin_lock_irqsave(&cm.lock, flags);
-                ret = idr_get_new_above(&cm.local_id_table, cm_id_priv, 1,
+                ret = idr_get_new_above(&cm.local_id_table, cm_id_priv, next_id++,
                                         (__force int *) &cm_id_priv->id.local_id);
                 spin_unlock_irqrestore(&cm.lock, flags);
         } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );
@@ -684,6 +685,13 @@ retest:
                 cm_reject_sidr_req(cm_id_priv, IB_SIDR_REJECT);
                 break;
         case IB_CM_REQ_SENT:
+                ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);
+                spin_unlock_irqrestore(&cm_id_priv->lock, flags);
+                ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
+                               &cm_id_priv->av.port->cm_dev->ca_guid,
+                               sizeof cm_id_priv->av.port->cm_dev->ca_guid,
+                               NULL, 0);
+                break;
         case IB_CM_MRA_REQ_RCVD:
         case IB_CM_REP_SENT:
         case IB_CM_MRA_REP_RCVD:
@@ -694,10 +702,8 @@ retest:
         case IB_CM_REP_RCVD:
         case IB_CM_MRA_REP_SENT:
                 spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-                ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
-                               &cm_id_priv->av.port->cm_dev->ca_guid,
-                               sizeof cm_id_priv->av.port->cm_dev->ca_guid,
-                               NULL, 0);
+                ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED,
+                               NULL, 0, NULL, 0);
                 break;
         case IB_CM_ESTABLISHED:
                 spin_unlock_irqrestore(&cm_id_priv->lock, flags);