From ff9d333171cbcf24ab092ce934f742b2c8588ce1 Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Thu, 8 Aug 2019 14:57:43 +0900
Subject: [PATCH] iscsi: Move macros to define max port name from portal_grp.h
 to iscsi.h

This is a preparation to the next patch which will change portal_host
and portal_port from malloc to fixed size.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I0f95d969edfd88efde41a43eaf0426fcd4b98987
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464135
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 lib/iscsi/iscsi.h      | 2 ++
 lib/iscsi/portal_grp.h | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 8a72bc1e6f..07856d5e72 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -60,6 +60,8 @@
 #define MAX_INITIATOR 256
 #define MAX_NETMASK 256
 #define MAX_ISCSI_CONNECTIONS 1024
+#define MAX_PORTAL_ADDR 256
+#define MAX_PORTAL_PORT 32
 
 #define DEFAULT_PORT 3260
 #define DEFAULT_MAX_SESSIONS 128
diff --git a/lib/iscsi/portal_grp.h b/lib/iscsi/portal_grp.h
index a0f2078776..1c6262db01 100644
--- a/lib/iscsi/portal_grp.h
+++ b/lib/iscsi/portal_grp.h
@@ -36,9 +36,8 @@
 #define SPDK_PORTAL_GRP_H
 
 #include "spdk/conf.h"
-
-#define MAX_PORTAL_ADDR	256
-#define MAX_PORTAL_PORT	32
+#include "spdk/cpuset.h"
+#include "iscsi/iscsi.h"
 
 struct spdk_json_write_ctx;