diff options
| author |   Parav Pandit <parav@mellanox.com> | 2018-01-09 15:24:52 +0200 |
|---|---|---|
| committer |   Jason Gunthorpe <jgg@mellanox.com> | 2018-01-15 15:33:21 -0700 |
| commit | f2290d6d522dbcdb8c2bd36e98e57c05bf5ed523 (patch) | |
| tree | b4e9b2e4e6ab9a86544ab1e0682e0e4ab354e22e /drivers/infiniband/core/verbs.c | |
| parent | IB/core: Limit DMAC resolution to userspace QPs (diff) | |
| download | linux-dev-f2290d6d522dbcdb8c2bd36e98e57c05bf5ed523.tar.xz linux-dev-f2290d6d522dbcdb8c2bd36e98e57c05bf5ed523.zip | |
IB/core: Attempt DMAC resolution for only RoCE
Instead of returning 0 (success) for RoCE scenarios where DMAC should
not be resolved, avoid such attempt and make code consistent with
ib_create_user_ah().
Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/core/verbs.c')
| -rw-r--r-- | drivers/infiniband/core/verbs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index af3f8780f93f..b110db6dbef0 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -1301,9 +1301,6 @@ static int ib_resolve_eth_dmac(struct ib_device *device, if (!rdma_is_port_valid(device, rdma_ah_get_port_num(ah_attr))) return -EINVAL; - if (ah_attr->type != RDMA_AH_ATTR_TYPE_ROCE) - return 0; - grh = rdma_ah_retrieve_grh(ah_attr); if (rdma_is_multicast_addr((struct in6_addr *)ah_attr->grh.dgid.raw)) { @@ -1369,7 +1366,8 @@ int ib_modify_qp_with_udata(struct ib_qp *ib_qp, struct ib_qp_attr *attr, struct ib_qp *qp = ib_qp->real_qp; int ret; - if (attr_mask & IB_QP_AV) { + if (attr_mask & IB_QP_AV && + attr->ah_attr.type == RDMA_AH_ATTR_TYPE_ROCE) { ret = ib_resolve_eth_dmac(qp->device, &attr->ah_attr); if (ret) return ret; |