From e2577e2a24b43bfe9e7f9842bbb33b1d17cfd1d2 Mon Sep 17 00:00:00 2001
From: Jacek Kalwas <jacek.kalwas@intel.com>
Date: Sat, 15 Feb 2020 06:30:46 +0100
Subject: [PATCH] nvmf: move transport stop listen into public interface

Signed-off-by: Jacek Kalwas <jacek.kalwas@intel.com>
Change-Id: Ibb44cb2058dda98d8b56a7e1954706fc7721047c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/912
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 include/spdk/nvmf.h  | 21 ++++++++++++++++-----
 lib/nvmf/transport.h |  3 ---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h
index 16d0766ea..d58173d53 100644
--- a/include/spdk/nvmf.h
+++ b/include/spdk/nvmf.h
@@ -980,7 +980,6 @@ void spdk_nvmf_tgt_add_transport(struct spdk_nvmf_tgt *tgt,
 				 void *cb_arg);
 
 /**
- *
  * Add listener to transport and begin accepting new connections.
  *
  * \param transport The transport to add listener to
@@ -990,11 +989,23 @@ void spdk_nvmf_tgt_add_transport(struct spdk_nvmf_tgt *tgt,
  *
  * \return int. 0 if it completed successfully, or negative errno if it failed.
  */
+int
+spdk_nvmf_transport_listen(struct spdk_nvmf_transport *transport,
+			   const struct spdk_nvme_transport_id *trid,
+			   spdk_nvmf_tgt_listen_done_fn cb_fn,
+			   void *cb_arg);
 
-int spdk_nvmf_transport_listen(struct spdk_nvmf_transport *transport,
-			       const struct spdk_nvme_transport_id *trid,
-			       spdk_nvmf_tgt_listen_done_fn cb_fn,
-			       void *cb_arg);
+/**
+ * Remove listener from transport and stop accepting new connections.
+ *
+ * \param transport The transport to remove listener from
+ * \param trid Address to stop listen at
+ *
+ * \return int. 0 if it completed successfully, or negative errno if it failed.
+ */
+int
+spdk_nvmf_transport_stop_listen(struct spdk_nvmf_transport *transport,
+				const struct spdk_nvme_transport_id *trid);
 
 /**
  * Write NVMe-oF target's transport configurations into provided JSON context.
diff --git a/lib/nvmf/transport.h b/lib/nvmf/transport.h
index 086ac416b..150638617 100644
--- a/lib/nvmf/transport.h
+++ b/lib/nvmf/transport.h
@@ -40,9 +40,6 @@
 #include "spdk/nvmf.h"
 #include "spdk/nvmf_transport.h"
 
-int spdk_nvmf_transport_stop_listen(struct spdk_nvmf_transport *transport,
-				    const struct spdk_nvme_transport_id *trid);
-
 void spdk_nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn,
 				void *cb_arg);