Removes irrelevant parameter during negotiation to avoid login fail.

Signed-off-by: Ye Ting<ting.ye@intel.com>
Reviewed by: Ouyang, Qian <qian.ouyang@intel.com>
Reviewed by: Tian, Feng<feng.tian@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13193 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c b/NetworkPkg/IScsiDxe/IScsiProto.c
index acb7876ab54b6480a5bc9058d387719e3186eb71..72c90a7fe8c997550a639318810964e187b8b1eb 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiProto.c
+++ b/NetworkPkg/IScsiDxe/IScsiProto.c
@@ -1291,7 +1291,7 @@ ON_EXIT:
 \r
 \r
 /**\r
-  Check and get the result of the prameter negotiation.\r
+  Check and get the result of the parameter negotiation.\r
 \r
   @param[in, out]  Conn          The connection in iSCSI login.\r
 \r
@@ -1539,6 +1539,12 @@ IScsiCheckOpParams (
   IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_PDU_IN_ORDER);\r
   IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_DATA_SEQUENCE_IN_ORDER);\r
 \r
+  //\r
+  // Remove irrelevant parameter, if any.\r
+  //\r
+  if (Session->InitialR2T && !Session->ImmediateData) {\r
+    IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_FIRST_BURST_LENGTH);\r
+  }\r
 \r
   if (IsListEmpty (KeyValueList)) {\r
     //\r
@@ -1558,7 +1564,7 @@ ON_ERROR:
 \r
 \r
 /**\r
-  Fill the oprational parameters.\r
+  Fill the operational parameters.\r
 \r
   @param[in]       Conn    The connection in iSCSI login.\r
   @param[in, out]  Pdu     The iSCSI login request PDU to fill the parameters.\r

diff --git a/NetworkPkg/IScsiDxe/IScsiProto.h b/NetworkPkg/IScsiDxe/IScsiProto.h
index 80c62b765c9ce0b0ed661d94f5fe14d38dddd4d1..d97fa083e2ca326b184248e855befa0f82358bb0 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiProto.h
+++ b/NetworkPkg/IScsiDxe/IScsiProto.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file of iSCSI Protocol that defines many specific data structures.\r
 \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -866,7 +866,7 @@ IScsiReceivePdu (
   );\r
 \r
 /**\r
-  Check and get the result of the prameter negotiation.\r
+  Check and get the result of the parameter negotiation.\r
 \r
   @param[in, out]  Conn          The connection in iSCSI login.\r
 \r
@@ -881,7 +881,7 @@ IScsiCheckOpParams (
   );\r
 \r
 /**\r
-  Fill the oprational prameters.\r
+  Fill the operational parameters.\r
 \r
   @param[in]       Conn    The connection in iSCSI login.\r
   @param[in, out]  Pdu     The iSCSI login request PDU to fill the parameters.\r