NetworkPkg: Fix connection issue after correct SPD and re-enable IPsec

This patch is used to fix connection failure issue after correct the SPD
and re-enable IPsec. The driver should not update the SadEntry's SpdSelector
when doing SpdEntry modification. SadEntry's SpdSelector may not equal to
this edited SpdEntry’s Selector.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18484 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/NetworkPkg/IpSecDxe/IpSecConfigImpl.c b/NetworkPkg/IpSecDxe/IpSecConfigImpl.c
index 6aa47aababfe25313fd983d2c6f546dccb4fb083..8c7724c7da80f9f9633fc4349d74ffbcca7a2b35 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecConfigImpl.c
+++ b/NetworkPkg/IpSecDxe/IpSecConfigImpl.c
@@ -1204,12 +1204,7 @@ SetSpdEntry (
           RemoveEntryList (&SadEntry->BySpd);\r
         }\r
         InsertTailList (&SpdEntry->Data->Sas, &SadEntry->BySpd);\r
           RemoveEntryList (&SadEntry->BySpd);\r
         }\r
         InsertTailList (&SpdEntry->Data->Sas, &SadEntry->BySpd);\r

-        SadEntry->Data->SpdEntry = SpdEntry;\r
-        DuplicateSpdSelector (\r
-          (EFI_IPSEC_CONFIG_SELECTOR *)SadEntry->Data->SpdSelector,\r
-          (EFI_IPSEC_CONFIG_SELECTOR *)SpdEntry->Selector,\r
-          NULL\r
-          );             \r
+        SadEntry->Data->SpdEntry = SpdEntry;             \r

       }\r
     }\r
   }\r
       }\r
     }\r
   }\r