[Patch v3 3/3] NetworkPkg/IScsiDxe: Display InitiatorInfo in attempt page even DHCP enabled.

[Jiaxin Wu <jiaxin.wu@intel.com>]

Cc: Karunakar P <karunakarp@amiindia.co.in>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index d401419..35e8f9a 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -189,13 +189,14 @@ formset
             flags  = INTERACTIVE,
             key    = KEY_DHCP_ENABLE,
     endcheckbox;
     endif;
 
-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01 OR
-               ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_IP6 OR 
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_IP6 OR 
                ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_AUTOCONFIG;
+               
+    grayoutif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
             flags   = INTERACTIVE,
             key     = KEY_LOCAL_IP,
@@ -218,10 +219,11 @@ formset
             flags   = INTERACTIVE,
             key     = KEY_GATE_WAY,
             minsize = IP4_MIN_SIZE,
             maxsize = IP4_MAX_SIZE,
     endstring;
+    endif;
     
     endif;
 
     suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_AUTOCONFIG;
     subtitle text = STRING_TOKEN(STR_NULL);
-- 
1.9.5.msysgit.1