IB/ucm: Get rid of duplicate P_Key parameter
The P_Key is provided into a SIDR REQ in two places, once as a parameter, and again in the path record. Remove the P_Key as a parameter and always use the one given in the path record. This change has no practical effect on ABI functionality. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
526b4caa0a
commit
75af908851
|
@ -2615,7 +2615,7 @@ static void cm_format_sidr_req(struct cm_sidr_req_msg *sidr_req_msg,
|
||||||
cm_format_mad_hdr(&sidr_req_msg->hdr, CM_SIDR_REQ_ATTR_ID,
|
cm_format_mad_hdr(&sidr_req_msg->hdr, CM_SIDR_REQ_ATTR_ID,
|
||||||
cm_form_tid(cm_id_priv, CM_MSG_SEQUENCE_SIDR));
|
cm_form_tid(cm_id_priv, CM_MSG_SEQUENCE_SIDR));
|
||||||
sidr_req_msg->request_id = cm_id_priv->id.local_id;
|
sidr_req_msg->request_id = cm_id_priv->id.local_id;
|
||||||
sidr_req_msg->pkey = cpu_to_be16(param->pkey);
|
sidr_req_msg->pkey = cpu_to_be16(param->path->pkey);
|
||||||
sidr_req_msg->service_id = param->service_id;
|
sidr_req_msg->service_id = param->service_id;
|
||||||
|
|
||||||
if (param->private_data && param->private_data_len)
|
if (param->private_data && param->private_data_len)
|
||||||
|
|
|
@ -1044,7 +1044,6 @@ static ssize_t ib_ucm_send_sidr_req(struct ib_ucm_file *file,
|
||||||
param.service_id = cmd.sid;
|
param.service_id = cmd.sid;
|
||||||
param.timeout_ms = cmd.timeout;
|
param.timeout_ms = cmd.timeout;
|
||||||
param.max_cm_retries = cmd.max_cm_retries;
|
param.max_cm_retries = cmd.max_cm_retries;
|
||||||
param.pkey = cmd.pkey;
|
|
||||||
|
|
||||||
ctx = ib_ucm_ctx_get(file, cmd.id);
|
ctx = ib_ucm_ctx_get(file, cmd.id);
|
||||||
if (!IS_ERR(ctx)) {
|
if (!IS_ERR(ctx)) {
|
||||||
|
|
|
@ -546,7 +546,6 @@ struct ib_cm_sidr_req_param {
|
||||||
const void *private_data;
|
const void *private_data;
|
||||||
u8 private_data_len;
|
u8 private_data_len;
|
||||||
u8 max_cm_retries;
|
u8 max_cm_retries;
|
||||||
u16 pkey;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -570,7 +569,7 @@ struct ib_cm_sidr_rep_param {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ib_send_cm_sidr_rep - Sends a service ID resolution request to the
|
* ib_send_cm_sidr_rep - Sends a service ID resolution reply to the
|
||||||
* remote node.
|
* remote node.
|
||||||
* @cm_id: Communication identifier associated with the received service ID
|
* @cm_id: Communication identifier associated with the received service ID
|
||||||
* resolution request.
|
* resolution request.
|
||||||
|
|
|
@ -200,7 +200,7 @@ struct ib_ucm_sidr_req {
|
||||||
__be64 sid;
|
__be64 sid;
|
||||||
__u64 data;
|
__u64 data;
|
||||||
__u64 path;
|
__u64 path;
|
||||||
__u16 pkey;
|
__u16 reserved_pkey;
|
||||||
__u8 len;
|
__u8 len;
|
||||||
__u8 max_cm_retries;
|
__u8 max_cm_retries;
|
||||||
__u8 reserved[4];
|
__u8 reserved[4];
|
||||||
|
|
Loading…
Reference in New Issue