netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: David Ahern <dsahern@gmail.com>
Cc: Leon Romanovsky <leonro@mellanox.com>,
	netdev <netdev@vger.kernel.org>,
	Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute2-next 09/10] rdma: Rename rd_free_devmap to be rd_free
Date: Wed, 27 Dec 2017 09:57:58 +0200	[thread overview]
Message-ID: <20171227075759.15289-10-leon@kernel.org> (raw)
In-Reply-To: <20171227075759.15289-1-leon@kernel.org>

From: Leon Romanovsky <leonro@mellanox.com>

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 rdma/rdma.c  | 3 +--
 rdma/rdma.h  | 2 +-
 rdma/utils.c | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rdma/rdma.c b/rdma/rdma.c
index a05a2fb6..0e8fd688 100644
--- 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 b85e3748..afc0e413 100644
--- 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 c1069967..d7284801 100644
--- 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);
 }
 
-- 
2.15.1

  parent reply	other threads:[~2017-12-27  7:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-27  7:57 [PATCH iproute2-next 00/10] RDMAtool cleanup and refactoring code Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 01/10] rdma: Reduce scope of _dev_map_lookup call Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 02/10] rdma: Protect dev_map_lookup from wrong input Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 03/10] rdma: Move per-device handler function to generic code Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 04/10] rdma: Fix misspelled SYS_IMAGE_GUID Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 05/10] rdma: Check that port index exists before operate on link layer Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 06/10] rdma: Print supplied device name in case of wrong name Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 07/10] rdma: Get rid of dev_map_free call Leon Romanovsky
2017-12-27  7:57 ` [PATCH iproute2-next 08/10] rdma: Rename free function to be rd_cleanup Leon Romanovsky
2017-12-27  7:57 ` Leon Romanovsky [this message]
2017-12-27  7:57 ` [PATCH iproute2-next 10/10] rdma: Move link execution logic to common code Leon Romanovsky
2017-12-27 15:45 ` [PATCH iproute2-next 00/10] RDMAtool cleanup and refactoring code David Ahern

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171227075759.15289-10-leon@kernel.org \
    --to=leon@kernel.org \
    --cc=dsahern@gmail.com \
    --cc=leonro@mellanox.com \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).