[PATCH v99 1/1] merge me

[Abhijit Gangurde]

---
 drivers/infiniband/hw/ionic/ionic_controlpath.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/infiniband/hw/ionic/ionic_controlpath.c b/drivers/infiniband/hw/ionic/ionic_controlpath.c
index 48c05b0c1c95..1ed45e1dd98d 100644
--- a/drivers/infiniband/hw/ionic/ionic_controlpath.c
+++ b/drivers/infiniband/hw/ionic/ionic_controlpath.c
@@ -294,8 +294,7 @@ static int ionic_get_qpid(struct ionic_ibdev *dev, u32 *qpid,
 static int ionic_get_srqid(struct ionic_ibdev *dev, u32 *srqid,
 			   u8 *udma_idx, u8 udma_mask)
 {
-	if (udma_mask &&
-	    !(udma_mask & dev->next_srqid_udma_idx))
+	if (udma_mask && !(udma_mask & BIT(dev->next_srqid_udma_idx)))
 		/* flip udma idx if it doesn't coincide with udma_mask */
 		dev->next_srqid_udma_idx ^= dev->lif_cfg.udma_count - 1;
 
@@ -2730,7 +2729,7 @@ static int ionic_create_srq_cmd(struct ionic_ibdev *dev,
 				.dma_addr = ionic_pgtbl_dma(buf, 0),
 				.dbid = cpu_to_le16(dbid),
 				.qid = cpu_to_le32(srq->rq.qid),
-				.low_wqes_limit = cpu_to_le32(srq->srq_limit),
+				.low_wqes_limit = cpu_to_le16(srq->srq_limit),
 			}
 		}
 	};
@@ -2774,7 +2773,7 @@ static int ionic_modify_srq_cmd(struct ionic_ibdev *dev, u32 srqid,
 			.len = cpu_to_le16(IONIC_ADMIN_MODIFY_SRQ_IN_V1_LEN),
 			.cmd.modify_srq = {
 				.qid = cpu_to_le32(srqid),
-				.low_wqes_limit = cpu_to_le32(srq_limit),
+				.low_wqes_limit = cpu_to_le16(srq_limit),
 			},
 		}
 	};
-- 
2.43.0