From cab35b6bc1e352cde15be75b970f992daac7f4ce Mon Sep 17 00:00:00 2001
From: Changpeng Liu <changpeng.liu@intel.com>
Date: Wed, 5 Sep 2018 21:39:49 -0400
Subject: [PATCH] nvme: move controller setting into nvme_ctrlr_identify()

Change-Id: Idd365df7fb61eafb502f415adf70638bb91ded0e
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/424773
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
---
 lib/nvme/nvme_ctrlr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c
index 03192002b..ce691f7a9 100644
--- a/lib/nvme/nvme_ctrlr.c
+++ b/lib/nvme/nvme_ctrlr.c
@@ -809,6 +809,11 @@ nvme_ctrlr_identify(struct spdk_nvme_ctrlr *ctrlr)
 		}
 	}
 
+	if (ctrlr->cdata.sgls.supported) {
+		ctrlr->flags |= SPDK_NVME_CTRLR_SGL_SUPPORTED;
+		ctrlr->max_sges = nvme_transport_ctrlr_get_max_sges(ctrlr);
+	}
+
 	return 0;
 }
 
@@ -1724,11 +1729,6 @@ nvme_ctrlr_start(struct spdk_nvme_ctrlr *ctrlr)
 	nvme_ctrlr_set_supported_log_pages(ctrlr);
 	nvme_ctrlr_set_supported_features(ctrlr);
 
-	if (ctrlr->cdata.sgls.supported) {
-		ctrlr->flags |= SPDK_NVME_CTRLR_SGL_SUPPORTED;
-		ctrlr->max_sges = nvme_transport_ctrlr_get_max_sges(ctrlr);
-	}
-
 	rc = nvme_ctrlr_set_doorbell_buffer_config(ctrlr);
 	if (rc) {
 		return rc;