[RFC PATCH 09/11] IB/Verbs: Use management helper has_ipoib() and, cap_ipoib() for ipoib-check
From: Michael Wang <hidden>
Date: 2015-03-27 15:48:45
Also in:
linux-nfs, linux-rdma, lkml
Subsystem:
infiniband subsystem, the rest · Maintainers:
Jason Gunthorpe, Leon Romanovsky, Linus Torvalds
Introduce helper has_ipoib() and cap_ipoib() to help us check if an IB device or it's port support IP over Infiniband. Cc: Jason Gunthorpe <redacted> Cc: Doug Ledford <redacted> Cc: Ira Weiny <ira.weiny@intel.com> Cc: Sean Hefty <redacted> Signed-off-by: Michael Wang <redacted> --- drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 +++--- include/rdma/ib_verbs.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 3341754..fcd7558 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c@@ -1655,7 +1655,7 @@ static void ipoib_add_one(struct ib_device *device) struct ipoib_dev_priv *priv; int s, e, p; - if (!rdma_transport_is_ib(device)) + if (!has_ipoib(device)) return; dev_list = kmalloc(sizeof *dev_list, GFP_KERNEL);
@@ -1673,7 +1673,7 @@ static void ipoib_add_one(struct ib_device *device) } for (p = s; p <= e; ++p) { - if (!rdma_port_ll_is_ib(device, p)) + if (!cap_ipoib(device, p)) continue; dev = ipoib_add_port("ib%d", device, p); if (!IS_ERR(dev)) {
@@ -1690,7 +1690,7 @@ static void ipoib_remove_one(struct ib_device *device) struct ipoib_dev_priv *priv, *tmp; struct list_head *dev_list; - if (!rdma_transport_is_ib(device)) + if (!has_ipoib(device)) return; dev_list = ib_get_client_data(device, &ipoib_client);
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 0ef9cd7..eead588 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h@@ -1849,6 +1849,19 @@ static inline int has_iwarp(struct ib_device *device) } /** + * has_ipoib - Check if a device support IP over Infiniband. + * + * @device: Device to be checked + * + * Return 0 when a device has none port to support + * IP over Infiniband. + */ +static inline int has_ipoib(struct ib_device *device) +{ + return rdma_transport_is_ib(device); +} + +/** * cap_smi - Check if the port of device has the capability * Subnet Management Interface. *
@@ -1893,6 +1906,21 @@ static inline int cap_mcast(struct ib_device *device, u8 port_num) return rdma_port_ll_is_ib(device, port_num); } +/** + * cap_ipoib - Check if the port of device has the capability + * IP over Infiniband. + * + * @device: Device to be checked + * @port_num: Port number of the device + * + * Return 0 when port of the device don't support + * IP over Infiniband. + */ +static inline int cap_ipoib(struct ib_device *device, u8 port_num) +{ + return rdma_port_ll_is_ib(device, port_num); +} + int ib_query_gid(struct ib_device *device, u8 port_num, int index, union ib_gid *gid);
--
2.1.0