From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
Convert REP flow control field.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
---
drivers/infiniband/core/cm.c | 5 +++--
drivers/infiniband/core/cm_msgs.h | 12 ------------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 4b1f90ba4ec9..2c99bd99eac3 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -2075,7 +2075,8 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
if (cm_id_priv->qp_type != IB_QPT_XRC_TGT) {
rep_msg->initiator_depth = param->initiator_depth;
- cm_rep_set_flow_ctrl(rep_msg, param->flow_control);
+ CM_SET(REP_END_TO_END_FLOW_CONTROL, rep_msg,
+ param->flow_control);
cm_rep_set_srq(rep_msg, param->srq);
CM_SET(REP_LOCAL_QPN, rep_msg, param->qp_num);
} else {
@@ -2224,7 +2225,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type)
param->initiator_depth = rep_msg->resp_resources;
param->target_ack_delay = CM_GET(REP_TARGET_ACK_DELAY, rep_msg);
param->failover_accepted = CM_GET(REP_FAILOVER_ACCEPTED, rep_msg);
- param->flow_control = cm_rep_get_flow_ctrl(rep_msg);
+ param->flow_control = CM_GET(REP_END_TO_END_FLOW_CONTROL, rep_msg);
param->rnr_retry_count = cm_rep_get_rnr_retry_count(rep_msg);
param->srq = cm_rep_get_srq(rep_msg);
work->cm_event.private_data = &rep_msg->private_data;
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index fdc3cd9d2f88..d9b831810dc2 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -462,18 +462,6 @@ struct cm_rep_msg {
} __packed;
-static inline u8 cm_rep_get_flow_ctrl(struct cm_rep_msg *rep_msg)
-{
- return (u8) (rep_msg->offset26 & 0x01);
-}
-
-static inline void cm_rep_set_flow_ctrl(struct cm_rep_msg *rep_msg,
- u8 flow_ctrl)
-{
- rep_msg->offset26 = (u8) ((rep_msg->offset26 & 0xFE) |
- (flow_ctrl & 0x1));
-}
-
static inline u8 cm_rep_get_rnr_retry_count(struct cm_rep_msg *rep_msg)
{
return (u8) (rep_msg->offset27 >> 5);
--
2.20.1
