1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 53661f34a326..fe838234cf94 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -241,7 +241,7 @@ struct cm_work {
         __be32 local_id;                        /* Established / timewait */
         __be32 remote_id;
         struct ib_cm_event cm_event;
-        struct ib_sa_path_rec path[0];
+        struct sa_path_rec path[0];
 };
 
 struct cm_timewait_info {
@@ -440,7 +440,7 @@ static void cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,
                            grh, &av->ah_attr);
 }
 
-static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av,
+static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
                               struct cm_id_private *cm_id_priv)
 {
         struct cm_device *cm_dev;
@@ -1172,8 +1172,8 @@ static void cm_format_req(struct cm_req_msg *req_msg,
                           struct cm_id_private *cm_id_priv,
                           struct ib_cm_req_param *param)
 {
-        struct ib_sa_path_rec *pri_path = param->primary_path;
-        struct ib_sa_path_rec *alt_path = param->alternate_path;
+        struct sa_path_rec *pri_path = param->primary_path;
+        struct sa_path_rec *alt_path = param->alternate_path;
 
         cm_format_mad_hdr(&req_msg->hdr, CM_REQ_ATTR_ID,
                           cm_form_tid(cm_id_priv, CM_MSG_SEQUENCE_REQ));
@@ -1401,8 +1401,8 @@ static inline int cm_is_active_peer(__be64 local_ca_guid, __be64 remote_ca_guid,
 }
 
 static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
-                                            struct ib_sa_path_rec *primary_path,
-                                            struct ib_sa_path_rec *alt_path)
+                                     struct sa_path_rec *primary_path,
+                                     struct sa_path_rec *alt_path)
 {
         memset(primary_path, 0, sizeof(*primary_path));
         primary_path->dgid = req_msg->primary_local_gid;
@@ -2815,7 +2815,7 @@ out:
 
 static void cm_format_lap(struct cm_lap_msg *lap_msg,
                           struct cm_id_private *cm_id_priv,
-                          struct ib_sa_path_rec *alternate_path,
+                          struct sa_path_rec *alternate_path,
                           const void *private_data,
                           u8 private_data_len)
 {
@@ -2845,7 +2845,7 @@ static void cm_format_lap(struct cm_lap_msg *lap_msg,
 }
 
 int ib_send_cm_lap(struct ib_cm_id *cm_id,
-                   struct ib_sa_path_rec *alternate_path,
+                   struct sa_path_rec *alternate_path,
                    const void *private_data,
                    u8 private_data_len)
 {
@@ -2899,7 +2899,7 @@ out:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);
 EXPORT_SYMBOL(ib_send_cm_lap);
 
 static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv,
-                                    struct ib_sa_path_rec *path,
+                                    struct sa_path_rec *path,
                                     struct cm_lap_msg *lap_msg)
 {
         memset(path, 0, sizeof *path);
@@ -3712,7 +3712,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
         atomic_long_inc(&port->counter_group[CM_RECV].
                         counter[attr_id - CM_ATTR_ID_OFFSET]);
 
-        work = kmalloc(sizeof(*work) + sizeof(struct ib_sa_path_rec) * paths,
+        work = kmalloc(sizeof(*work) + sizeof(struct sa_path_rec) * paths,
                        GFP_KERNEL);
         if (!work) {
                 ib_free_recv_mad(mad_recv_wc);