aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/core/cm.c3
-rw-r--r--include/rdma/ib_cm.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 82d5c4362aa8..93e9e2f34fc6 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1268,6 +1268,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
1268 primary_path->packet_life_time = 1268 primary_path->packet_life_time =
1269 cm_req_get_primary_local_ack_timeout(req_msg); 1269 cm_req_get_primary_local_ack_timeout(req_msg);
1270 primary_path->packet_life_time -= (primary_path->packet_life_time > 0); 1270 primary_path->packet_life_time -= (primary_path->packet_life_time > 0);
1271 primary_path->service_id = req_msg->service_id;
1271 1272
1272 if (req_msg->alt_local_lid) { 1273 if (req_msg->alt_local_lid) {
1273 memset(alt_path, 0, sizeof *alt_path); 1274 memset(alt_path, 0, sizeof *alt_path);
@@ -1289,6 +1290,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
1289 alt_path->packet_life_time = 1290 alt_path->packet_life_time =
1290 cm_req_get_alt_local_ack_timeout(req_msg); 1291 cm_req_get_alt_local_ack_timeout(req_msg);
1291 alt_path->packet_life_time -= (alt_path->packet_life_time > 0); 1292 alt_path->packet_life_time -= (alt_path->packet_life_time > 0);
1293 alt_path->service_id = req_msg->service_id;
1292 } 1294 }
1293} 1295}
1294 1296
@@ -2992,6 +2994,7 @@ static void cm_format_sidr_req_event(struct cm_work *work,
2992 param = &work->cm_event.param.sidr_req_rcvd; 2994 param = &work->cm_event.param.sidr_req_rcvd;
2993 param->pkey = __be16_to_cpu(sidr_req_msg->pkey); 2995 param->pkey = __be16_to_cpu(sidr_req_msg->pkey);
2994 param->listen_id = listen_id; 2996 param->listen_id = listen_id;
2997 param->service_id = sidr_req_msg->service_id;
2995 param->port = work->port->port_num; 2998 param->port = work->port->port_num;
2996 work->cm_event.private_data = &sidr_req_msg->private_data; 2999 work->cm_event.private_data = &sidr_req_msg->private_data;
2997} 3000}
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index 39ed2d2fbd51..1b567bbc3ad4 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -223,6 +223,7 @@ struct ib_cm_apr_event_param {
223 223
224struct ib_cm_sidr_req_event_param { 224struct ib_cm_sidr_req_event_param {
225 struct ib_cm_id *listen_id; 225 struct ib_cm_id *listen_id;
226 __be64 service_id;
226 u8 port; 227 u8 port;
227 u16 pkey; 228 u16 pkey;
228}; 229};