From c55cdc4fca10efb0a63cb6fba2f2544bead8cb64 Mon Sep 17 00:00:00 2001
From: Jacek Kalwas <jacek.kalwas@intel.com>
Date: Mon, 17 Feb 2020 18:31:30 +0100
Subject: [PATCH] nvmf: fix SHIFT_4KB redefinition by NVMF_ prefix

it is defined in memory.h

Signed-off-by: Jacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I3a65f82e565dc56c5d4e3e0211571e1d1dddf393
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/920
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
---
 include/spdk/nvmf_transport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h
index a3541d1e0b..54685c8b9d 100644
--- a/include/spdk/nvmf_transport.h
+++ b/include/spdk/nvmf_transport.h
@@ -52,8 +52,8 @@
 /* AIO backend requires block size aligned data buffers,
  * extra 4KiB aligned data buffer should work for most devices.
  */
-#define SHIFT_4KB			12u
-#define NVMF_DATA_BUFFER_ALIGNMENT	(1u << SHIFT_4KB)
+#define NVMF_SHIFT_4KB			12u
+#define NVMF_DATA_BUFFER_ALIGNMENT	(1u << NVMF_SHIFT_4KB)
 #define NVMF_DATA_BUFFER_MASK		(NVMF_DATA_BUFFER_ALIGNMENT - 1LL)
 
 union nvmf_h2c_msg {