The pkey is provided into a SIDR REQ in two places, once as a parameter,
and again in the path record. Remove the pkey as a parameter and always
use that given in the path record.
This change has no practical effect on ABI functionality.
Signed-off-by: Sean Hefty <[EMAIL PROTECTED]>
---
Index: include/rdma/ib_cm.h
===================================================================
--- include/rdma/ib_cm.h (revision 6884)
+++ include/rdma/ib_cm.h (working copy)
@@ -546,7 +546,6 @@ struct ib_cm_sidr_req_param {
const void *private_data;
u8 private_data_len;
u8 max_cm_retries;
- u16 pkey;
};
/**
Index: include/rdma/ib_user_cm.h
===================================================================
--- include/rdma/ib_user_cm.h (revision 6884)
+++ include/rdma/ib_user_cm.h (working copy)
@@ -200,7 +200,7 @@ struct ib_ucm_sidr_req {
__be64 sid;
__u64 data;
__u64 path;
- __u16 pkey;
+ __u16 reserved_pkey;
__u8 len;
__u8 max_cm_retries;
__u8 reserved[4];
Index: core/ucm.c
===================================================================
--- core/ucm.c (revision 7119)
+++ core/ucm.c (working copy)
@@ -1044,7 +1044,6 @@ static ssize_t ib_ucm_send_sidr_req(stru
param.service_id = cmd.sid;
param.timeout_ms = cmd.timeout;
param.max_cm_retries = cmd.max_cm_retries;
- param.pkey = cmd.pkey;
ctx = ib_ucm_ctx_get(file, cmd.id);
if (!IS_ERR(ctx)) {
Index: core/cm.c
===================================================================
--- core/cm.c (revision 7197)
+++ core/cm.c (working copy)
@@ -2615,7 +2606,7 @@ static void cm_format_sidr_req(struct cm
cm_format_mad_hdr(&sidr_req_msg->hdr, CM_SIDR_REQ_ATTR_ID,
cm_form_tid(cm_id_priv, CM_MSG_SEQUENCE_SIDR));
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;
if (param->private_data && param->private_data_len)
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
