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>

2 files changed, 2 insertions, 3 deletions

diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 8f394f035684..c9b4738be9d6 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -546,7 +546,6 @@ struct ib_cm_sidr_req_param {
         const void              *private_data;
         u8                      private_data_len;
         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.
  * @cm_id: Communication identifier associated with the received service ID
  *   resolution request.
diff --git a/include/rdma/ib_user_cm.h b/include/rdma/ib_user_cm.h
index a9e1b22d245c..066c20b7cdfb 100644
--- a/include/rdma/ib_user_cm.h
+++ b/include/rdma/ib_user_cm.h
@@ -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];