From 0b10bb6f4387fd0587329d43e768a90371d63491 Mon Sep 17 00:00:00 2001 From: Wu Jiaxin Date: Tue, 19 Nov 2013 05:52:10 +0000 Subject: [PATCH] Fix a bug about iSCSI initiator(based on NetworkPkg-IPv4 network stack) cannot reinstate session with Windows iSCSI target. Signed-off-by: Wu Jiaxin Reviewed-by: Fu Siyuan Reviewed-by: Jin Eric git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14862 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/IScsiDxe/IScsiProto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c b/NetworkPkg/IScsiDxe/IScsiProto.c index 8c0bbec067..29b3c24997 100644 --- a/NetworkPkg/IScsiDxe/IScsiProto.c +++ b/NetworkPkg/IScsiDxe/IScsiProto.c @@ -228,7 +228,7 @@ IScsiCreateConnection ( Conn->PartialRspRcvd = FALSE; Conn->ParamNegotiated = FALSE; Conn->Cid = Session->NextCid++; - Conn->Ipv6Flag = mPrivate->Ipv6Flag; + Conn->Ipv6Flag = NvData->IpMode == IP_MODE_IP6 || Session->ConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6; Status = gBS->CreateEvent ( EVT_TIMER, @@ -472,7 +472,7 @@ IScsiSessionLogin ( if (!EFI_ERROR (Status)) { Session->State = SESSION_STATE_LOGGED_IN; - if (!mPrivate->Ipv6Flag) { + if (!Conn->Ipv6Flag) { ProtocolGuid = &gEfiTcp4ProtocolGuid; } else { ProtocolGuid = &gEfiTcp6ProtocolGuid; @@ -489,7 +489,7 @@ IScsiSessionLogin ( ASSERT_EFI_ERROR (Status); - if (mPrivate->Ipv6Flag) { + if (Conn->Ipv6Flag) { Status = IScsiGetIp6NicInfo (Conn); } } -- 2.39.2