rdma: Rename rd_free_devmap to be rd_free

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/rdma/rdma.c b/rdma/rdma.c
index a05a2fb68a43c357262b352171bf89a21001e101..0e8fd688674ce8e3622af6546d8b1286ec878346 100644 (file)
--- a/rdma/rdma.c
+++ b/rdma/rdma.c
@@ -74,8 +74,7 @@ static void rd_cleanup(struct rd *rd)
 {
        if (rd->json_output)
                jsonw_destroy(&rd->jw);
-       free(rd->buff);
-       rd_free_devmap(rd);
+       rd_free(rd);
 }
 
 int main(int argc, char **argv)

diff --git a/rdma/rdma.h b/rdma/rdma.h
index b85e3748596e05a8506aab22140557ea39f3d7df..afc0e41337f0c53567b6c6a0498927ce5bd54376 100644 (file)
--- a/rdma/rdma.h
+++ b/rdma/rdma.h
@@ -73,11 +73,11 @@ int cmd_dev(struct rd *rd);
 int cmd_link(struct rd *rd);
 int rd_exec_cmd(struct rd *rd, const struct rd_cmd *c, const char *str);
 int rd_exec_dev(struct rd *rd, int (*cb)(struct rd *rd));
+void rd_free(struct rd *rd);
 
 /*
  * Device manipulation
  */
-void rd_free_devmap(struct rd *rd);
 struct dev_map *dev_map_lookup(struct rd *rd, bool allow_port_index);
 
 /*

diff --git a/rdma/utils.c b/rdma/utils.c
index c10699675958e9eb60733bd687127636fb23c49d..d728480190b9e6336abe80f888bacf1ff17f7777 100644 (file)
--- a/rdma/utils.c
+++ b/rdma/utils.c
@@ -144,10 +144,11 @@ int rd_dev_init_cb(const struct nlmsghdr *nlh, void *data)
        return MNL_CB_OK;
 }
 
-void rd_free_devmap(struct rd *rd)
+void rd_free(struct rd *rd)
 {
        if (!rd)
                return;
+       free(rd->buff);
        dev_map_cleanup(rd);
 }