This patch will introduce rdma_tech_is_iboe() and use it to save some code. Cc: Ira Weiny <ira.weiny@xxxxxxxxx> Cc: Sean Hefty <sean.hefty@xxxxxxxxx> Signed-off-by: Michael Wang <yun.wang@xxxxxxxxxxxxxxxx> --- drivers/infiniband/core/cma.c | 6 ++---- include/rdma/ib_verbs.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 668e955..d354857 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -375,8 +375,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, listen_id_priv->id.port_num) == dev_ll) { cma_dev = listen_id_priv->cma_dev; port = listen_id_priv->id.port_num; - if (rdma_transport_is_ib(cma_dev->device) && - rdma_port_ll_is_eth(cma_dev->device, port)) + if (rdma_tech_is_iboe(cma_dev->device, port)) ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL); else @@ -395,8 +394,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, listen_id_priv->id.port_num == port) continue; if (rdma_port_get_link_layer(cma_dev->device, port) == dev_ll) { - if (rdma_transport_is_ib(cma_dev->device) && - rdma_port_ll_is_eth(cma_dev->device, port)) + if (rdma_tech_is_iboe(cma_dev->device, port)) ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL); else ret = ib_find_cached_gid(cma_dev->device, &gid, &found_port, NULL); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 2bf9094..9a811f8 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1767,6 +1767,12 @@ static inline int rdma_port_ll_is_eth(struct ib_device *device, u8 port_num) == IB_LINK_LAYER_ETHERNET; } +static inline int rdma_tech_is_iboe(struct ib_device *device, u8 port_num) +{ + return rdma_transport_is_ib(device) && + rdma_port_ll_is_eth(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid); -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html