Remove empty stubs for detach/attach_mcast

Just use ibv_cmd_* directly.  Simplifies the code and fixes const
correctness warnings due to changes in libibverbs.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/src/mlx4.c b/src/mlx4.c
index 34ece392d1b059c2a4c52e48c63d6368a8f738da..1295c536e6f910bf6caaf187af483bd4ad412e36 100644 (file)
--- a/src/mlx4.c
+++ b/src/mlx4.c
@@ -94,8 +94,8 @@ static struct ibv_context_ops mlx4_ctx_ops = {
        .post_recv     = mlx4_post_recv,
        .create_ah     = mlx4_create_ah,
        .destroy_ah    = mlx4_destroy_ah,
-       .attach_mcast  = mlx4_attach_mcast,
-       .detach_mcast  = mlx4_detach_mcast
+       .attach_mcast  = ibv_cmd_attach_mcast,
+       .detach_mcast  = ibv_cmd_detach_mcast
 };
 
 static struct ibv_context *mlx4_alloc_context(struct ibv_device *ibdev, int cmd_fd)

diff --git a/src/mlx4.h b/src/mlx4.h
index 827a201437bcf72f68c2d61c7ec1ba66aa0003e4..0c658cf92573f581b024748f5ffc4b54cabb8096 100644 (file)
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -361,7 +361,5 @@ int mlx4_destroy_ah(struct ibv_ah *ah);
 int mlx4_alloc_av(struct mlx4_pd *pd, struct ibv_ah_attr *attr,
                   struct mlx4_ah *ah);
 void mlx4_free_av(struct mlx4_ah *ah);
-int mlx4_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int mlx4_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
 
 #endif /* MLX4_H */

diff --git a/src/verbs.c b/src/verbs.c
index cc179a09890f8b6adbe7420eaee9a3b99923cb1b..2c19d93a9f34cd7503077ee6f0c28e2218c86bc2 100644 (file)
--- a/src/verbs.c
+++ b/src/verbs.c
@@ -651,13 +651,3 @@ int mlx4_destroy_ah(struct ibv_ah *ah)
 
        return 0;
 }
-
-int mlx4_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-       return ibv_cmd_attach_mcast(qp, gid, lid);
-}
-
-int mlx4_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
-{
-       return ibv_cmd_detach_mcast(qp, gid, lid);
-}