aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core/core_priv.h
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2018-01-08 16:06:20 -0500
committerDoug Ledford <dledford@redhat.com>2018-01-08 16:06:20 -0500
commitf8457d5832d882d8a74fe41a6ce70313a31b3e0e (patch)
treec5d080c599c0f2aa8bd2ce522698242a540e6b88 /drivers/infiniband/core/core_priv.h
parentnet/mlx5: Set num_vhca_ports capability (diff)
parentIB/srpt: Micro-optimize I/O context state manipulation (diff)
downloadlinux-dev-f8457d5832d882d8a74fe41a6ce70313a31b3e0e.tar.xz
linux-dev-f8457d5832d882d8a74fe41a6ce70313a31b3e0e.zip
Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next
Merging in 12 patch series from Bart that required changes in the current for-rc branch in order to apply cleanly. Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/core_priv.h')
-rw-r--r--drivers/infiniband/core/core_priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 39e4acdb025e..74091bdca245 100644
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -293,7 +293,7 @@ static inline int ib_mad_enforce_security(struct ib_mad_agent_private *map,
}
#endif
-struct ib_device *__ib_device_get_by_index(u32 ifindex);
+struct ib_device *ib_device_get_by_index(u32 ifindex);
/* RDMA device netlink */
void nldev_init(void);
void nldev_exit(void);