Skip to content

Commit 9aa1692

Browse files
paravmellanoxdledford
authored andcommitted
RDMA/cma: Do not query GID during QP state transition to RTR
When commit [1] was added, SGID was queried to derive the SMAC address. Then, later on during a refactor [2], SMAC was no longer needed. However, the now useless GID query remained. Then during additional code changes later on, the GID query was being done in such a way that it caused iWARP queries to start breaking. Remove the useless GID query and resolve the iWARP breakage at the same time. This is discussed in [3]. [1] commit dd5f03b ("IB/core: Ethernet L2 attributes in verbs/cm structures") [2] commit 5c266b2 ("IB/cm: Remove the usage of smac and vid of qp_attr and cm_av") [3] https://www.spinics.net/lists/linux-rdma/msg63951.html Suggested-by: Shiraz Saleem <[email protected]> Signed-off-by: Parav Pandit <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent b03bcde commit 9aa1692

File tree

1 file changed

+0
-7
lines changed
  • drivers/infiniband/core

1 file changed

+0
-7
lines changed

drivers/infiniband/core/cma.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,6 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
868868
{
869869
struct ib_qp_attr qp_attr;
870870
int qp_attr_mask, ret;
871-
union ib_gid sgid;
872871

873872
mutex_lock(&id_priv->qp_mutex);
874873
if (!id_priv->id.qp) {
@@ -891,12 +890,6 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
891890
if (ret)
892891
goto out;
893892

894-
ret = ib_query_gid(id_priv->id.device, id_priv->id.port_num,
895-
rdma_ah_read_grh(&qp_attr.ah_attr)->sgid_index,
896-
&sgid, NULL);
897-
if (ret)
898-
goto out;
899-
900893
BUG_ON(id_priv->cma_dev->device != id_priv->id.device);
901894

902895
if (conn_param)

0 commit comments

Comments
 (0)