[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <551298F9.8030306@profitbricks.com>
Date: Wed, 25 Mar 2015 12:16:09 +0100
From: Michael Wang <yun.wang@...fitbricks.com>
To: Roland Dreier <roland@...nel.org>,
Sean Hefty <sean.hefty@...el.com>,
Hal Rosenstock <hal.rosenstock@...il.com>,
linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-nfs@...r.kernel.org, netdev@...r.kernel.org,
Ira Weiny <ira.weiny@...el.com>
CC: "J. Bruce Fields" <bfields@...ldses.org>,
Trond Myklebust <trond.myklebust@...marydata.com>,
"David S. Miller" <davem@...emloft.net>,
Moni Shoua <monis@...lanox.com>,
PJ Waskiewicz <pj.waskiewicz@...idfire.com>,
Steve Wise <swise@...ngridcomputing.com>,
Tatyana Nikolova <Tatyana.E.Nikolova@...el.com>,
Yan Burman <yanb@...lanox.com>,
Jack Morgenstein <jackm@....mellanox.co.il>,
Yann Droneaud <ydroneaud@...eya.com>,
Bart Van Assche <bvanassche@....org>,
Colin Ian King <colin.king@...onical.com>,
Mel Gorman <mgorman@...e.de>, Majd Dibbiny <majd@...lanox.com>,
Jiri Kosina <jkosina@...e.cz>,
Matan Barak <matanb@...lanox.com>,
Dan Carpenter <dan.carpenter@...cle.com>,
Eugenia Emantayev <eugenia@...lanox.co.il>,
Doug Ledford <dledford@...hat.com>,
Alex Estrin <alex.estrin@...el.com>,
Erez Shitrit <erezsh@...lanox.com>,
Eric Dumazet <edumazet@...gle.com>,
Tom Gundersen <teg@...m.no>,
Sagi Grimberg <sagig@...lanox.com>,
Haggai Eran <haggaie@...lanox.com>,
Shachar Raindel <raindel@...lanox.com>,
Mike Marciniszyn <mike.marciniszyn@...el.com>,
Tom Tucker <tom@....us>, Chuck Lever <chuck.lever@...cle.com>
Subject: [PATCH 2/2] IB/Verbs: Use helpers to check IBoE technology
This patch will introduce rdma_tech_is_iboe() and use it to save some code.
Cc: Ira Weiny <ira.weiny@...el.com>
Cc: Sean Hefty <sean.hefty@...el.com>
Signed-off-by: Michael Wang <yun.wang@...fitbricks.com>
---
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 netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists