summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Jiaxin <jiaxin.wu@intel.com>2013-11-19 05:52:10 +0000
committerjiaxinwu <jiaxinwu@6f19259b-4bc3-4df7-8a09-765794883524>2013-11-19 05:52:10 +0000
commit0b10bb6f4387fd0587329d43e768a90371d63491 (patch)
tree8fe8cefa474f06bef13b0192aa9ad2f7a70087f3
parent7df095713ad520121da7a4eae9bf8e089a5fd5e4 (diff)
downloadedk2-platforms-0b10bb6f4387fd0587329d43e768a90371d63491.tar.xz
Fix a bug about iSCSI initiator(based on NetworkPkg-IPv4 network stack) cannot reinstate session with Windows iSCSI target.
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com > Reviewed-by: Fu Siyuan <siyuan.fu@intel.com> Reviewed-by: Jin Eric <eric.jin@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14862 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--NetworkPkg/IScsiDxe/IScsiProto.c6
1 files 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);
}
}