2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 4de93ba274a6..96136543aa4e 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -173,7 +173,8 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv,
         if (IS_ERR(ah))
                 return PTR_ERR(ah);
 
-        m = ib_create_send_mad(mad_agent, 1, cm_id_priv->av.pkey_index,
+        m = ib_create_send_mad(mad_agent, cm_id_priv->id.remote_cm_qpn, 
+                               cm_id_priv->av.pkey_index,
                                ah, 0, sizeof(struct ib_mad_hdr),
                                sizeof(struct ib_mad)-sizeof(struct ib_mad_hdr),
                                GFP_ATOMIC);
@@ -536,6 +537,7 @@ struct ib_cm_id *ib_create_cm_id(ib_cm_handler cm_handler,
         cm_id_priv->id.state = IB_CM_IDLE;
         cm_id_priv->id.cm_handler = cm_handler;
         cm_id_priv->id.context = context;
+        cm_id_priv->id.remote_cm_qpn = 1;
         ret = cm_alloc_id(cm_id_priv);
         if (ret)
                 goto error;
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 77fe9039209b..5308683c8c41 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -290,6 +290,7 @@ struct ib_cm_id {
         enum ib_cm_lap_state    lap_state;      /* internal CM/debug use */
         __be32                  local_id;
         __be32                  remote_id;
+        u32                     remote_cm_qpn;  /* 1 unless redirected */
 };
 
 /**