From 44c6faac9ac4b97b96b801e00af03b4e0cd6bf9e Mon Sep 17 00:00:00 2001
From: Changpeng Liu <changpeng.liu@intel.com>
Date: Thu, 24 Jan 2019 22:06:01 -0500
Subject: [PATCH] nvme: move hardcoded keep alive timeout value to macro
 definition

Change-Id: I27ab6ea046ade42f941b323cea5f104bb952c53d
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/441994
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Arshad Hussain <arshad.super@gmail.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/nvme/nvme_ctrlr.c    | 2 +-
 lib/nvme/nvme_internal.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c
index 39a6ac3b5..b9e73ad11 100644
--- a/lib/nvme/nvme_ctrlr.c
+++ b/lib/nvme/nvme_ctrlr.c
@@ -103,7 +103,7 @@ spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts, size_t
 	}
 
 	if (FIELD_OK(keep_alive_timeout_ms)) {
-		opts->keep_alive_timeout_ms = 10 * 1000;
+		opts->keep_alive_timeout_ms = MIN_KEEP_ALIVE_TIMEOUT_IN_MS;
 	}
 
 	if (FIELD_OK(io_queue_size)) {
diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h
index 92d4753e9..785152fb0 100644
--- a/lib/nvme/nvme_internal.h
+++ b/lib/nvme/nvme_internal.h
@@ -135,6 +135,8 @@ extern pid_t g_spdk_nvme_pid;
 #define DEFAULT_ADMIN_QUEUE_REQUESTS	(32)
 #define DEFAULT_IO_QUEUE_REQUESTS	(512)
 
+#define MIN_KEEP_ALIVE_TIMEOUT_IN_MS	(10000)
+
 /* We want to fit submission and completion rings each in a single 2MB
  * hugepage to ensure physical address contiguity.
  */