aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Hefty <sean.hefty@intel.com>2007-02-22 14:37:38 -0500
committerRoland Dreier <rolandd@cisco.com>2007-02-22 20:54:33 -0500
commite971b8cd19d39366b9fdc9eadafec988d785264d (patch)
tree6a20311b91485d111f697a6c46863c375023e824
parent962063e64b0c55d270979fa0e4ae26daedac6282 (diff)
IB/cm: Remove ca_guid from cm_device structure
The cm_device references an ib_device, which already contains the node_guid. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/core/cm.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index d446998b12a4..842cd0b53e91 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -88,7 +88,6 @@ struct cm_port {
88struct cm_device { 88struct cm_device {
89 struct list_head list; 89 struct list_head list;
90 struct ib_device *device; 90 struct ib_device *device;
91 __be64 ca_guid;
92 struct cm_port port[0]; 91 struct cm_port port[0];
93}; 92};
94 93
@@ -739,8 +738,8 @@ retest:
739 ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg); 738 ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);
740 spin_unlock_irqrestore(&cm_id_priv->lock, flags); 739 spin_unlock_irqrestore(&cm_id_priv->lock, flags);
741 ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT, 740 ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
742 &cm_id_priv->av.port->cm_dev->ca_guid, 741 &cm_id_priv->id.device->node_guid,
743 sizeof cm_id_priv->av.port->cm_dev->ca_guid, 742 sizeof cm_id_priv->id.device->node_guid,
744 NULL, 0); 743 NULL, 0);
745 break; 744 break;
746 case IB_CM_REQ_RCVD: 745 case IB_CM_REQ_RCVD:
@@ -883,7 +882,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
883 882
884 req_msg->local_comm_id = cm_id_priv->id.local_id; 883 req_msg->local_comm_id = cm_id_priv->id.local_id;
885 req_msg->service_id = param->service_id; 884 req_msg->service_id = param->service_id;
886 req_msg->local_ca_guid = cm_id_priv->av.port->cm_dev->ca_guid; 885 req_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
887 cm_req_set_local_qpn(req_msg, cpu_to_be32(param->qp_num)); 886 cm_req_set_local_qpn(req_msg, cpu_to_be32(param->qp_num));
888 cm_req_set_resp_res(req_msg, param->responder_resources); 887 cm_req_set_resp_res(req_msg, param->responder_resources);
889 cm_req_set_init_depth(req_msg, param->initiator_depth); 888 cm_req_set_init_depth(req_msg, param->initiator_depth);
@@ -1442,7 +1441,7 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
1442 cm_rep_set_flow_ctrl(rep_msg, param->flow_control); 1441 cm_rep_set_flow_ctrl(rep_msg, param->flow_control);
1443 cm_rep_set_rnr_retry_count(rep_msg, param->rnr_retry_count); 1442 cm_rep_set_rnr_retry_count(rep_msg, param->rnr_retry_count);
1444 cm_rep_set_srq(rep_msg, param->srq); 1443 cm_rep_set_srq(rep_msg, param->srq);
1445 rep_msg->local_ca_guid = cm_id_priv->av.port->cm_dev->ca_guid; 1444 rep_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
1446 1445
1447 if (param->private_data && param->private_data_len) 1446 if (param->private_data && param->private_data_len)
1448 memcpy(rep_msg->private_data, param->private_data, 1447 memcpy(rep_msg->private_data, param->private_data,
@@ -3385,7 +3384,6 @@ static void cm_add_one(struct ib_device *device)
3385 return; 3384 return;
3386 3385
3387 cm_dev->device = device; 3386 cm_dev->device = device;
3388 cm_dev->ca_guid = device->node_guid;
3389 3387
3390 set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask); 3388 set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask);
3391 for (i = 1; i <= device->phys_port_cnt; i++) { 3389 for (i = 1; i <= device->phys_port_cnt; i++) {